diff --git a/source/Cosmos.Assembler.html b/source/Cosmos.Assembler.html
index 95a7ec02a..63be3f14a 100644
--- a/source/Cosmos.Assembler.html
+++ b/source/Cosmos.Assembler.html
@@ -5,8 +5,23 @@
+
+ Cosmos.Assembler
- TODO: Rename to Cosmos.Assembler
+ Base platform independent project for emitting machine langauge.
+
+ Cosmos.Assembler.XSharp
+
+ Higher level x86 assembler. Its paralell to Cosmos.Assembler.x86 as it is meant
+ to be an alternative language although it does rely on and use
+ Cosmos.Assembler.x86.
+
+ Cosmos.Assembler.x86
+
+ Holds ops for raw assembly. Currently does output to NASM too, but in future the
+ binary and NASM (and X# for output debugging) should be in separate assemblies
+ so the generation / output is seperated from the storage/assembly used by the
+ compiler.
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 4ab46b388..9fbdad5e4 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -108,7 +108,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.DebugStub", ".
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Assembler", "..\source2\Cosmos.Assembler\Cosmos.Assembler.csproj", "{1116130E-28E0-428A-A597-F4B3B676C0CA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Compiler.Assembler.X86", "..\source2\Compiler\Cosmos.Compiler.Assembler.X86\Cosmos.Compiler.Assembler.X86.csproj", "{94D079E4-3C66-486A-8407-EA6EC049FF53}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Assembler.x86", "..\source2\Compiler\Cosmos.Compiler.Assembler.X86\Cosmos.Assembler.x86.csproj", "{94D079E4-3C66-486A-8407-EA6EC049FF53}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BreakpointsKernel", "..\source2\Users\Kudzu\Breakpoints\BreakpointsKernel.csproj", "{91CBD640-C07D-4556-B4CB-6F8CD88C67C9}"
EndProject
@@ -262,111 +262,111 @@ Global
SccProjectTopLevelParentUniqueName19 = Cosmos.sln
SccProjectName19 = ../source2/Users/Kudzu/Breakpoints
SccLocalPath19 = ..\\source2\\Users\\Kudzu\\Breakpoints
- SccProjectUniqueName20 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86\\Cosmos.Compiler.Assembler.X86.csproj
+ SccProjectUniqueName20 = ..\\source2\\Users\\Kudzu\\Breakpoints\\BreakpointsKernel.csproj
SccProjectTopLevelParentUniqueName20 = Cosmos.sln
- SccProjectName20 = ../source2/Compiler/Cosmos.Compiler.Assembler.X86
- SccLocalPath20 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86
- SccProjectUniqueName21 = ..\\source2\\Users\\Kudzu\\Breakpoints\\BreakpointsKernel.csproj
+ SccProjectName20 = ../source2/Users/Kudzu/Breakpoints
+ SccLocalPath20 = ..\\source2\\Users\\Kudzu\\Breakpoints
+ SccProjectUniqueName21 = Cosmos\\Cosmos.Hardware\\Cosmos.Hardware2.csproj
SccProjectTopLevelParentUniqueName21 = Cosmos.sln
- SccProjectName21 = ../source2/Users/Kudzu/Breakpoints
- SccLocalPath21 = ..\\source2\\Users\\Kudzu\\Breakpoints
- SccProjectUniqueName22 = Cosmos\\Cosmos.Hardware\\Cosmos.Hardware2.csproj
+ SccProjectName21 = Cosmos/Cosmos.Hardware
+ SccLocalPath21 = Cosmos\\Cosmos.Hardware
+ SccProjectUniqueName22 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core\\Cosmos.Core.csproj
SccProjectTopLevelParentUniqueName22 = Cosmos.sln
- SccProjectName22 = Cosmos/Cosmos.Hardware
- SccLocalPath22 = Cosmos\\Cosmos.Hardware
- SccProjectUniqueName23 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core\\Cosmos.Core.csproj
+ SccProjectName22 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core
+ SccLocalPath22 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core
+ SccProjectUniqueName23 = ..\\source2\\Kernel\\System\\Hardware\\Cosmos.Hardware\\Cosmos.Hardware.csproj
SccProjectTopLevelParentUniqueName23 = Cosmos.sln
- SccProjectName23 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core
- SccLocalPath23 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core
- SccProjectUniqueName24 = ..\\source2\\Kernel\\System\\Hardware\\Cosmos.Hardware\\Cosmos.Hardware.csproj
+ SccProjectName23 = ../source2/Kernel/System/Hardware/Cosmos.Hardware
+ SccLocalPath23 = ..\\source2\\Kernel\\System\\Hardware\\Cosmos.Hardware
+ SccProjectUniqueName24 = ..\\source2\\Kernel\\System\\Cosmos.System\\Cosmos.System.csproj
SccProjectTopLevelParentUniqueName24 = Cosmos.sln
- SccProjectName24 = ../source2/Kernel/System/Hardware/Cosmos.Hardware
- SccLocalPath24 = ..\\source2\\Kernel\\System\\Hardware\\Cosmos.Hardware
- SccProjectUniqueName25 = ..\\source2\\Kernel\\System\\Cosmos.System\\Cosmos.System.csproj
+ SccProjectName24 = ../source2/Kernel/System/Cosmos.System
+ SccLocalPath24 = ..\\source2\\Kernel\\System\\Cosmos.System
+ SccProjectUniqueName25 = ..\\source2\\Kernel\\System\\Cosmos.System.Plugs.System\\Cosmos.System.Plugs.System.csproj
SccProjectTopLevelParentUniqueName25 = Cosmos.sln
- SccProjectName25 = ../source2/Kernel/System/Cosmos.System
- SccLocalPath25 = ..\\source2\\Kernel\\System\\Cosmos.System
- SccProjectUniqueName26 = ..\\source2\\Kernel\\System\\Cosmos.System.Plugs.System\\Cosmos.System.Plugs.System.csproj
+ SccProjectName25 = ../source2/Kernel/System/Cosmos.System.Plugs.System
+ SccLocalPath25 = ..\\source2\\Kernel\\System\\Cosmos.System.Plugs.System
+ SccProjectUniqueName26 = ..\\source2\\VSIP\\Cosmos.VS.Wizards\\Cosmos.VS.Wizards.csproj
SccProjectTopLevelParentUniqueName26 = Cosmos.sln
- SccProjectName26 = ../source2/Kernel/System/Cosmos.System.Plugs.System
- SccLocalPath26 = ..\\source2\\Kernel\\System\\Cosmos.System.Plugs.System
- SccProjectUniqueName27 = ..\\source2\\VSIP\\Cosmos.VS.Wizards\\Cosmos.VS.Wizards.csproj
+ SccProjectName26 = ../source2/VSIP/Cosmos.VS.Wizards
+ SccLocalPath26 = ..\\source2\\VSIP\\Cosmos.VS.Wizards
+ SccProjectUniqueName27 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core.Plugs\\Cosmos.Core.Plugs.csproj
SccProjectTopLevelParentUniqueName27 = Cosmos.sln
- SccProjectName27 = ../source2/VSIP/Cosmos.VS.Wizards
- SccLocalPath27 = ..\\source2\\VSIP\\Cosmos.VS.Wizards
- SccProjectUniqueName28 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core.Plugs\\Cosmos.Core.Plugs.csproj
+ SccProjectName27 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs
+ SccLocalPath27 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core.Plugs
+ SccProjectUniqueName28 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel\\Cosmos.Debug.Kernel.csproj
SccProjectTopLevelParentUniqueName28 = Cosmos.sln
- SccProjectName28 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs
- SccLocalPath28 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core.Plugs
- SccProjectUniqueName29 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel\\Cosmos.Debug.Kernel.csproj
+ SccProjectName28 = ../source2/Kernel/Debug/Cosmos.Debug.Kernel
+ SccLocalPath28 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel
+ SccProjectUniqueName29 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel.Plugs\\Cosmos.Debug.Kernel.Plugs.csproj
SccProjectTopLevelParentUniqueName29 = Cosmos.sln
- SccProjectName29 = ../source2/Kernel/Debug/Cosmos.Debug.Kernel
- SccLocalPath29 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel
- SccProjectUniqueName30 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel.Plugs\\Cosmos.Debug.Kernel.Plugs.csproj
+ SccProjectName29 = ../source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs
+ SccLocalPath29 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel.Plugs
+ SccProjectUniqueName30 = ..\\source2\\Demos\\Guess\\Guess.Cosmos
SccProjectTopLevelParentUniqueName30 = Cosmos.sln
- SccProjectName30 = ../source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs
- SccLocalPath30 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel.Plugs
- SccProjectUniqueName31 = ..\\source2\\Demos\\Guess\\Guess.Cosmos
+ SccProjectName30 = ../source2/Demos/Guess
+ SccLocalPath30 = ..\\source2\\Demos\\Guess
+ SccProjectUniqueName31 = ..\\source2\\Build\\InstallCleaner\\InstallCleaner.csproj
SccProjectTopLevelParentUniqueName31 = Cosmos.sln
- SccProjectName31 = ../source2/Demos/Guess
- SccLocalPath31 = ..\\source2\\Demos\\Guess
- SccProjectUniqueName32 = ..\\source2\\Build\\InstallCleaner\\InstallCleaner.csproj
+ SccProjectName31 = ../source2/Build/InstallCleaner
+ SccLocalPath31 = ..\\source2\\Build\\InstallCleaner
+ SccProjectUniqueName32 = ..\\source2\\Kernel\\Common\\Cosmos.Common.Extensions\\Cosmos.Common.Extensions.csproj
SccProjectTopLevelParentUniqueName32 = Cosmos.sln
- SccProjectName32 = ../source2/Build/InstallCleaner
- SccLocalPath32 = ..\\source2\\Build\\InstallCleaner
- SccProjectUniqueName33 = ..\\source2\\Kernel\\Common\\Cosmos.Common.Extensions\\Cosmos.Common.Extensions.csproj
+ SccProjectName32 = ../source2/Kernel/Common/Cosmos.Common.Extensions
+ SccLocalPath32 = ..\\source2\\Kernel\\Common\\Cosmos.Common.Extensions
+ SccProjectUniqueName33 = ..\\source2\\Demos\\Guess\\GuessKernel.csproj
SccProjectTopLevelParentUniqueName33 = Cosmos.sln
- SccProjectName33 = ../source2/Kernel/Common/Cosmos.Common.Extensions
- SccLocalPath33 = ..\\source2\\Kernel\\Common\\Cosmos.Common.Extensions
- SccProjectUniqueName34 = ..\\source2\\Demos\\Guess\\GuessKernel.csproj
+ SccProjectName33 = ../source2/Demos/Guess
+ SccLocalPath33 = ..\\source2\\Demos\\Guess
+ SccProjectUniqueName34 = ..\\source2\\Build\\Cosmos.Build.StandAlone\\Cosmos.Build.StandAlone.csproj
SccProjectTopLevelParentUniqueName34 = Cosmos.sln
- SccProjectName34 = ../source2/Demos/Guess
- SccLocalPath34 = ..\\source2\\Demos\\Guess
- SccProjectUniqueName35 = ..\\source2\\Build\\Cosmos.Build.StandAlone\\Cosmos.Build.StandAlone.csproj
+ SccProjectName34 = ../source2/Build/Cosmos.Build.StandAlone
+ SccLocalPath34 = ..\\source2\\Build\\Cosmos.Build.StandAlone
+ SccProjectUniqueName35 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground\\MatthijsPlayground.csproj
SccProjectTopLevelParentUniqueName35 = Cosmos.sln
- SccProjectName35 = ../source2/Build/Cosmos.Build.StandAlone
- SccLocalPath35 = ..\\source2\\Build\\Cosmos.Build.StandAlone
- SccProjectUniqueName36 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground\\MatthijsPlayground.csproj
+ SccProjectName35 = ../source2/Users/Matthijs/MatthijsPlayground
+ SccLocalPath35 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground
+ SccProjectUniqueName36 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground\\MatthijsPlaygroundBoot.Cosmos
SccProjectTopLevelParentUniqueName36 = Cosmos.sln
SccProjectName36 = ../source2/Users/Matthijs/MatthijsPlayground
SccLocalPath36 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground
- SccProjectUniqueName37 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground\\MatthijsPlaygroundBoot.Cosmos
+ SccProjectUniqueName37 = ..\\source2\\Kernel\\Common\\Cosmos.Common\\Cosmos.Common.csproj
SccProjectTopLevelParentUniqueName37 = Cosmos.sln
- SccProjectName37 = ../source2/Users/Matthijs/MatthijsPlayground
- SccLocalPath37 = ..\\source2\\Users\\Matthijs\\MatthijsPlayground
- SccProjectUniqueName38 = ..\\source2\\Kernel\\Common\\Cosmos.Common\\Cosmos.Common.csproj
+ SccProjectName37 = ../source2/Kernel/Common/Cosmos.Common
+ SccLocalPath37 = ..\\source2\\Kernel\\Common\\Cosmos.Common
+ SccProjectUniqueName38 = ..\\source2\\VSIP\\Cosmos.VS.Windows\\Cosmos.VS.Windows.csproj
SccProjectTopLevelParentUniqueName38 = Cosmos.sln
- SccProjectName38 = ../source2/Kernel/Common/Cosmos.Common
- SccLocalPath38 = ..\\source2\\Kernel\\Common\\Cosmos.Common
- SccProjectUniqueName39 = ..\\source2\\VSIP\\Cosmos.VS.Windows\\Cosmos.VS.Windows.csproj
+ SccProjectName38 = ../source2/VSIP/Cosmos.VS.Windows
+ SccLocalPath38 = ..\\source2\\VSIP\\Cosmos.VS.Windows
+ SccProjectUniqueName39 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Debug\\Cosmos.Debug.Consts.csproj
SccProjectTopLevelParentUniqueName39 = Cosmos.sln
- SccProjectName39 = ../source2/VSIP/Cosmos.VS.Windows
- SccLocalPath39 = ..\\source2\\VSIP\\Cosmos.VS.Windows
- SccProjectUniqueName40 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Debug\\Cosmos.Debug.Consts.csproj
+ SccProjectName39 = ../source2/IL2CPU/Cosmos.IL2CPU.Debug
+ SccLocalPath39 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Debug
+ SccProjectUniqueName40 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Debug.DebugStub.csproj
SccProjectTopLevelParentUniqueName40 = Cosmos.sln
- SccProjectName40 = ../source2/IL2CPU/Cosmos.IL2CPU.Debug
- SccLocalPath40 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Debug
- SccProjectUniqueName41 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Debug.DebugStub.csproj
+ SccProjectName40 = ../source2/Compiler/Cosmos.Compiler.DebugStub
+ SccLocalPath40 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub
+ SccProjectUniqueName41 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test\\Cosmos.VS.Windows.Test.csproj
SccProjectTopLevelParentUniqueName41 = Cosmos.sln
- SccProjectName41 = ../source2/Compiler/Cosmos.Compiler.DebugStub
- SccLocalPath41 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub
- SccProjectUniqueName42 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test\\Cosmos.VS.Windows.Test.csproj
+ SccProjectName41 = ../source2/VSIP/Cosmos.VS.Windows.Test
+ SccLocalPath41 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test
+ SccProjectUniqueName42 = ..\\source2\\Cosmos.Assembler.XSharp\\Cosmos.Assembler.XSharp.csproj
SccProjectTopLevelParentUniqueName42 = Cosmos.sln
- SccProjectName42 = ../source2/VSIP/Cosmos.VS.Windows.Test
- SccLocalPath42 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test
- SccProjectUniqueName43 = ..\\source2\\Cosmos.Assembler.XSharp\\Cosmos.Assembler.XSharp.csproj
- SccProjectTopLevelParentUniqueName43 = Cosmos.sln
- SccProjectName43 = ../source2/Cosmos.Assembler.XSharp
- SccLocalPath43 = ..\\source2\\Cosmos.Assembler.XSharp
- SccWebProject44 = true
- SccProjectUniqueName44 = ..\\Docs
- SccProjectName44 = ../Docs
- SccLocalPath44 = ..\\Docs
- SccProjectEnlistmentChoice44 = 2
- SccProjectUniqueName45 = ..\\source2\\Cosmos.Assembler\\Cosmos.Assembler.csproj
+ SccProjectName42 = ../source2/Cosmos.Assembler.XSharp
+ SccLocalPath42 = ..\\source2\\Cosmos.Assembler.XSharp
+ SccWebProject43 = true
+ SccProjectUniqueName43 = ..\\Docs
+ SccProjectName43 = ../Docs
+ SccLocalPath43 = ..\\Docs
+ SccProjectEnlistmentChoice43 = 2
+ SccProjectUniqueName44 = ..\\source2\\Cosmos.Assembler\\Cosmos.Assembler.csproj
+ SccProjectTopLevelParentUniqueName44 = Cosmos.sln
+ SccProjectName44 = ../source2/Cosmos.Assembler
+ SccLocalPath44 = ..\\source2\\Cosmos.Assembler
+ SccProjectUniqueName45 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86\\Cosmos.Assembler.x86.csproj
SccProjectTopLevelParentUniqueName45 = Cosmos.sln
- SccProjectName45 = ../source2/Cosmos.Assembler
- SccLocalPath45 = ..\\source2\\Cosmos.Assembler
+ SccProjectName45 = ../source2/Compiler/Cosmos.Compiler.Assembler.X86
+ SccLocalPath45 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Bootstrap|Any CPU = Bootstrap|Any CPU
diff --git a/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj b/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
index 115fcf0eb..ae443c662 100644
--- a/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
+++ b/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
@@ -88,9 +88,9 @@
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
diff --git a/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj b/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
index 1f9999583..679954947 100644
--- a/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
+++ b/source/Cosmos/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
@@ -83,9 +83,9 @@
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
index fd2d5ca72..b8c9b0b64 100644
--- a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
+++ b/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -83,9 +83,9 @@
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/..svnbridge/.svnbridge b/source2/Compiler/Cosmos.Assembler.x86/..svnbridge/.svnbridge
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/..svnbridge/.svnbridge
rename to source2/Compiler/Cosmos.Assembler.x86/..svnbridge/.svnbridge
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Add.cs b/source2/Compiler/Cosmos.Assembler.x86/Add.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Add.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Add.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/AddWithCarry.cs b/source2/Compiler/Cosmos.Assembler.x86/AddWithCarry.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/AddWithCarry.cs
rename to source2/Compiler/Cosmos.Assembler.x86/AddWithCarry.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/And.cs b/source2/Compiler/Cosmos.Assembler.x86/And.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/And.cs
rename to source2/Compiler/Cosmos.Assembler.x86/And.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Call.cs b/source2/Compiler/Cosmos.Assembler.x86/Call.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Call.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Call.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ClrCarryFlag.cs b/source2/Compiler/Cosmos.Assembler.x86/ClrCarryFlag.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ClrCarryFlag.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ClrCarryFlag.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ClrDirFlag.cs b/source2/Compiler/Cosmos.Assembler.x86/ClrDirFlag.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ClrDirFlag.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ClrDirFlag.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ClrInterruptFlag.cs b/source2/Compiler/Cosmos.Assembler.x86/ClrInterruptFlag.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ClrInterruptFlag.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ClrInterruptFlag.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/CmpXchg.cs b/source2/Compiler/Cosmos.Assembler.x86/CmpXchg.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/CmpXchg.cs
rename to source2/Compiler/Cosmos.Assembler.x86/CmpXchg.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Cmps.cs b/source2/Compiler/Cosmos.Assembler.x86/Cmps.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Cmps.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Cmps.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Compare.cs b/source2/Compiler/Cosmos.Assembler.x86/Compare.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Compare.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Compare.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ConditionalJump.cs b/source2/Compiler/Cosmos.Assembler.x86/ConditionalJump.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ConditionalJump.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ConditionalJump.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ConditionalMove.cs b/source2/Compiler/Cosmos.Assembler.x86/ConditionalMove.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ConditionalMove.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ConditionalMove.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ConvByteToWord.cs b/source2/Compiler/Cosmos.Assembler.x86/ConvByteToWord.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ConvByteToWord.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ConvByteToWord.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Cosmos.Compiler.Assembler.X86.csproj b/source2/Compiler/Cosmos.Assembler.x86/Cosmos.Assembler.x86.csproj
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Cosmos.Compiler.Assembler.X86.csproj
rename to source2/Compiler/Cosmos.Assembler.x86/Cosmos.Assembler.x86.csproj
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Cosmos.Compiler.Assembler.X86.csproj.vspscc b/source2/Compiler/Cosmos.Assembler.x86/Cosmos.Assembler.x86.csproj.vspscc
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Cosmos.Compiler.Assembler.X86.csproj.vspscc
rename to source2/Compiler/Cosmos.Assembler.x86/Cosmos.Assembler.x86.csproj.vspscc
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Cosmos.snk b/source2/Compiler/Cosmos.Assembler.x86/Cosmos.snk
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Cosmos.snk
rename to source2/Compiler/Cosmos.Assembler.x86/Cosmos.snk
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/CpuId.cs b/source2/Compiler/Cosmos.Assembler.x86/CpuId.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/CpuId.cs
rename to source2/Compiler/Cosmos.Assembler.x86/CpuId.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Dec.cs b/source2/Compiler/Cosmos.Assembler.x86/Dec.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Dec.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Dec.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Divide.cs b/source2/Compiler/Cosmos.Assembler.x86/Divide.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Divide.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Divide.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Enums.cs b/source2/Compiler/Cosmos.Assembler.x86/Enums.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Enums.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Enums.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ExternalLabel.cs b/source2/Compiler/Cosmos.Assembler.x86/ExternalLabel.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ExternalLabel.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ExternalLabel.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Halt.cs b/source2/Compiler/Cosmos.Assembler.x86/Halt.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Halt.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Halt.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/IDivide.cs b/source2/Compiler/Cosmos.Assembler.x86/IDivide.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/IDivide.cs
rename to source2/Compiler/Cosmos.Assembler.x86/IDivide.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/In.cs b/source2/Compiler/Cosmos.Assembler.x86/IN.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/In.cs
rename to source2/Compiler/Cosmos.Assembler.x86/IN.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Inc.cs b/source2/Compiler/Cosmos.Assembler.x86/INC.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Inc.cs
rename to source2/Compiler/Cosmos.Assembler.x86/INC.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/INT.cs b/source2/Compiler/Cosmos.Assembler.x86/INT.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/INT.cs
rename to source2/Compiler/Cosmos.Assembler.x86/INT.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Int1.cs b/source2/Compiler/Cosmos.Assembler.x86/INT1.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Int1.cs
rename to source2/Compiler/Cosmos.Assembler.x86/INT1.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Int3.cs b/source2/Compiler/Cosmos.Assembler.x86/INT3.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Int3.cs
rename to source2/Compiler/Cosmos.Assembler.x86/INT3.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/IRET.cs b/source2/Compiler/Cosmos.Assembler.x86/IRET.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/IRET.cs
rename to source2/Compiler/Cosmos.Assembler.x86/IRET.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/JumpAlways.cs b/source2/Compiler/Cosmos.Assembler.x86/JumpAlways.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/JumpAlways.cs
rename to source2/Compiler/Cosmos.Assembler.x86/JumpAlways.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/JumpBase.cs b/source2/Compiler/Cosmos.Assembler.x86/JumpBase.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/JumpBase.cs
rename to source2/Compiler/Cosmos.Assembler.x86/JumpBase.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/JumpToSegment.cs b/source2/Compiler/Cosmos.Assembler.x86/JumpToSegment.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/JumpToSegment.cs
rename to source2/Compiler/Cosmos.Assembler.x86/JumpToSegment.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Lgdt.cs b/source2/Compiler/Cosmos.Assembler.x86/Lgdt.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Lgdt.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Lgdt.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Lidt.cs b/source2/Compiler/Cosmos.Assembler.x86/Lidt.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Lidt.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Lidt.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/LoadStatusFlags.cs b/source2/Compiler/Cosmos.Assembler.x86/LoadStatusFlags.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/LoadStatusFlags.cs
rename to source2/Compiler/Cosmos.Assembler.x86/LoadStatusFlags.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Mov.cs b/source2/Compiler/Cosmos.Assembler.x86/Mov.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Mov.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Mov.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveCR.cs b/source2/Compiler/Cosmos.Assembler.x86/MoveCR.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveCR.cs
rename to source2/Compiler/Cosmos.Assembler.x86/MoveCR.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveD.cs b/source2/Compiler/Cosmos.Assembler.x86/MoveD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/MoveD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveSignExtend.cs b/source2/Compiler/Cosmos.Assembler.x86/MoveSignExtend.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveSignExtend.cs
rename to source2/Compiler/Cosmos.Assembler.x86/MoveSignExtend.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveToDR6.cs b/source2/Compiler/Cosmos.Assembler.x86/MoveToDR6.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveToDR6.cs
rename to source2/Compiler/Cosmos.Assembler.x86/MoveToDR6.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveZeroExtend.cs b/source2/Compiler/Cosmos.Assembler.x86/MoveZeroExtend.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/MoveZeroExtend.cs
rename to source2/Compiler/Cosmos.Assembler.x86/MoveZeroExtend.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Movs.cs b/source2/Compiler/Cosmos.Assembler.x86/Movs.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Movs.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Movs.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Multiply.cs b/source2/Compiler/Cosmos.Assembler.x86/Multiply.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Multiply.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Multiply.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Neg.cs b/source2/Compiler/Cosmos.Assembler.x86/Neg.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Neg.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Neg.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Noop.cs b/source2/Compiler/Cosmos.Assembler.x86/Noop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Noop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Noop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Not.cs b/source2/Compiler/Cosmos.Assembler.x86/Not.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Not.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Not.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Or.cs b/source2/Compiler/Cosmos.Assembler.x86/Or.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Or.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Or.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Out.cs b/source2/Compiler/Cosmos.Assembler.x86/Out.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Out.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Out.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Pop.cs b/source2/Compiler/Cosmos.Assembler.x86/Pop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Pop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Pop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Popad.cs b/source2/Compiler/Cosmos.Assembler.x86/Popad.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Popad.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Popad.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Popfd.cs b/source2/Compiler/Cosmos.Assembler.x86/Popfd.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Popfd.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Popfd.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Properties/AssemblyInfo.cs b/source2/Compiler/Cosmos.Assembler.x86/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Properties/AssemblyInfo.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Properties/AssemblyInfo.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Push.cs b/source2/Compiler/Cosmos.Assembler.x86/Push.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Push.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Push.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Pushad.cs b/source2/Compiler/Cosmos.Assembler.x86/Pushad.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Pushad.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Pushad.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Pushfd.cs b/source2/Compiler/Cosmos.Assembler.x86/Pushfd.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Pushfd.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Pushfd.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Registers.cs b/source2/Compiler/Cosmos.Assembler.x86/Registers.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Registers.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Registers.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Return.cs b/source2/Compiler/Cosmos.Assembler.x86/Return.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Return.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Return.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/RotateLeft.cs b/source2/Compiler/Cosmos.Assembler.x86/RotateLeft.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/RotateLeft.cs
rename to source2/Compiler/Cosmos.Assembler.x86/RotateLeft.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/RotateRight.cs b/source2/Compiler/Cosmos.Assembler.x86/RotateRight.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/RotateRight.cs
rename to source2/Compiler/Cosmos.Assembler.x86/RotateRight.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/RotateThroughCarryRight.cs b/source2/Compiler/Cosmos.Assembler.x86/RotateThroughCarryRight.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/RotateThroughCarryRight.cs
rename to source2/Compiler/Cosmos.Assembler.x86/RotateThroughCarryRight.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSD2SI.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSD2SI.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSD2SI.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSD2SI.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSD2SS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSD2SS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSD2SS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSD2SS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSI2SD.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSI2SD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSI2SD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSI2SD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSS2SD.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSS2SD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertSS2SD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertSS2SD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertTruncateSD2SI.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertTruncateSD2SI.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertTruncateSD2SI.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertTruncateSD2SI.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertTruncateSS2SI.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertTruncateSS2SI.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/ConvertTruncateSS2SI.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/ConvertTruncateSS2SI.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/MoveSD.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/MoveSD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/MoveSD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/MoveSD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/SqrtSD.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/SqrtSD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/SqrtSD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/SqrtSD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/XorPD.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE2/XorPD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE2/XorPD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE2/XorPD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE3/IntStoreWithTrunc.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE3/IntStoreWithTrunc.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE3/IntStoreWithTrunc.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE3/IntStoreWithTrunc.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE3/MoveDoubleAndDupplicate.cs b/source2/Compiler/Cosmos.Assembler.x86/SSE3/MoveDoubleAndDupplicate.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSE3/MoveDoubleAndDupplicate.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSE3/MoveDoubleAndDupplicate.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/AddPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/AddPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/AddPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/AddPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/AddSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/AddSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/AddSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/AddSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/AndPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/AndPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/AndPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/AndPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/ComparePS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/ComparePS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/ComparePS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/ComparePS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/CompareSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/CompareSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/CompareSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/CompareSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/ConvertSI2SS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/ConvertSI2SS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/ConvertSI2SS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/ConvertSI2SS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/ConvertSS2SI.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/ConvertSS2SI.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/ConvertSS2SI.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/ConvertSS2SI.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/DivPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/DivPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/DivPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/DivPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/DivSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/DivSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/DivSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/DivSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/Enums.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/Enums.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/Enums.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/Enums.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/InstructionWithDestinationAndSourceAndPseudoOpcodes.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/InstructionWithDestinationAndSourceAndPseudoOpcodes.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/InstructionWithDestinationAndSourceAndPseudoOpcodes.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/InstructionWithDestinationAndSourceAndPseudoOpcodes.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MaxSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MaxSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MaxSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MaxSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MinSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MinSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MinSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MinSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveAPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveAPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveAPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveAPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveHLPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveHLPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveHLPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveHLPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveHPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveHPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveHPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveHPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveLHPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveLHPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveLHPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveLHPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveUPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveUPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MoveUPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MoveUPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MulPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MulPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MulPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MulPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MulSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MulSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/MulSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/MulSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/SubPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/SubPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/SubPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/SubPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/SubSS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/SubSS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/SubSS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/SubSS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/XorPS.cs b/source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/XorPS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SSEAndMMX2/XorPS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SSEAndMMX2/XorPS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Scas.cs b/source2/Compiler/Cosmos.Assembler.x86/Scas.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Scas.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Scas.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SetInterruptFlag.cs b/source2/Compiler/Cosmos.Assembler.x86/SetInterruptFlag.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SetInterruptFlag.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SetInterruptFlag.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ShiftLeft.cs b/source2/Compiler/Cosmos.Assembler.x86/ShiftLeft.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ShiftLeft.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ShiftLeft.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/ShiftRight.cs b/source2/Compiler/Cosmos.Assembler.x86/ShiftRight.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/ShiftRight.cs
rename to source2/Compiler/Cosmos.Assembler.x86/ShiftRight.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Shld.cs b/source2/Compiler/Cosmos.Assembler.x86/Shld.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Shld.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Shld.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Shrd.cs b/source2/Compiler/Cosmos.Assembler.x86/Shrd.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Shrd.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Shrd.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SignExtendAX.cs b/source2/Compiler/Cosmos.Assembler.x86/SignExtendAX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SignExtendAX.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SignExtendAX.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/StoreByteInString.cs b/source2/Compiler/Cosmos.Assembler.x86/StoreByteInString.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/StoreByteInString.cs
rename to source2/Compiler/Cosmos.Assembler.x86/StoreByteInString.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/StoreSD.cs b/source2/Compiler/Cosmos.Assembler.x86/StoreSD.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/StoreSD.cs
rename to source2/Compiler/Cosmos.Assembler.x86/StoreSD.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/StoreWordInString.cs b/source2/Compiler/Cosmos.Assembler.x86/StoreWordInString.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/StoreWordInString.cs
rename to source2/Compiler/Cosmos.Assembler.x86/StoreWordInString.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Stos.cs b/source2/Compiler/Cosmos.Assembler.x86/Stos.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Stos.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Stos.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Sub.cs b/source2/Compiler/Cosmos.Assembler.x86/Sub.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Sub.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Sub.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/SubWithCarry.cs b/source2/Compiler/Cosmos.Assembler.x86/SubWithCarry.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/SubWithCarry.cs
rename to source2/Compiler/Cosmos.Assembler.x86/SubWithCarry.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Test.cs b/source2/Compiler/Cosmos.Assembler.x86/Test.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Test.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Test.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Xchg.cs b/source2/Compiler/Cosmos.Assembler.x86/Xchg.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Xchg.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Xchg.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/XchgAndAdd.cs b/source2/Compiler/Cosmos.Assembler.x86/XchgAndAdd.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/XchgAndAdd.cs
rename to source2/Compiler/Cosmos.Assembler.x86/XchgAndAdd.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/Xor.cs b/source2/Compiler/Cosmos.Assembler.x86/Xor.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/Xor.cs
rename to source2/Compiler/Cosmos.Assembler.x86/Xor.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/Extensions.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/Extensions.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/Extensions.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/Extensions.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithArgument.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithArgument.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithArgument.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithArgument.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithCondition.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithCondition.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithCondition.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithCondition.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithDestination.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithDestination.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithDestination.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithDestination.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithPrefix.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithPrefix.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithPrefix.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithPrefix.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithSize.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithSize.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithSize.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithSize.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithSource.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithSource.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/IInstructionWithSource.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/IInstructionWithSource.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/Instruction.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/Instruction.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/Instruction.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/Instruction.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestination.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestination.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestination.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestination.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSize.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSize.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSize.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSize.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSource.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSource.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSource.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSource.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSourceAndArgument.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSourceAndArgument.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSourceAndArgument.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSourceAndArgument.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSourceAndSize.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSourceAndSize.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithDestinationAndSourceAndSize.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithDestinationAndSourceAndSize.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithSize.cs b/source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithSize.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/_Infra/InstructionWithSize.cs
rename to source2/Compiler/Cosmos.Assembler.x86/_Infra/InstructionWithSize.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/Enums.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/Enums.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/Enums.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/Enums.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FXSave.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FXSave.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FXSave.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FXSave.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FXStore.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FXStore.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FXStore.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FXStore.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatABS.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatABS.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatABS.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatABS.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatAdd.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatAdd.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatAdd.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatAdd.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatAddAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatAddAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatAddAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatAddAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatClearEx.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatClearEx.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatClearEx.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatClearEx.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompare.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompare.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompare.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompare.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAnd2Pop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAnd2Pop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAnd2Pop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAnd2Pop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAndSet.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAndSet.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAndSet.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAndSet.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAndSetAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAndSetAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareAndSetAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareAndSetAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareOrderAndSet.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareOrderAndSet.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareOrderAndSet.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareOrderAndSet.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareOrderSetAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareOrderSetAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCompareOrderSetAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCompareOrderSetAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatConditionalMove.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatConditionalMove.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatConditionalMove.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatConditionalMove.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCosine.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatCosine.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatCosine.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatCosine.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDecTopPointer.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatDecTopPointer.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDecTopPointer.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatDecTopPointer.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivide.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivide.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivide.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivide.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivideAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivideAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivideAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivideAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivideAndPopReverse.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivideAndPopReverse.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivideAndPopReverse.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivideAndPopReverse.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivideReverse.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivideReverse.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatDivideReverse.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatDivideReverse.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatFree.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatFree.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatFree.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatFree.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatIncTopPointer.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatIncTopPointer.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatIncTopPointer.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatIncTopPointer.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatInit.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatInit.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatInit.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatInit.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatLoad.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatLoad.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatLoad.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatLoad.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatMul.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatMul.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatMul.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatMul.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatMulAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatMulAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatMulAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatMulAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatNegate.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatNegate.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatNegate.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatNegate.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPRem.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatPRem.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPRem.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatPRem.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPRem1.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatPRem1.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPRem1.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatPRem1.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPushOne.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatPushOne.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPushOne.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatPushOne.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPushZero.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatPushZero.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatPushZero.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatPushZero.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatRound.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatRound.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatRound.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatRound.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSine.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatSine.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSine.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatSine.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSqrt.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatSqrt.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSqrt.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatSqrt.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatStore.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatStore.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatStore.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatStore.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatStoreAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatStoreAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatStoreAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatStoreAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSub.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatSub.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSub.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatSub.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSubAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatSubAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSubAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatSubAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSubAndPopReverse.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatSubAndPopReverse.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSubAndPopReverse.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatSubAndPopReverse.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSubReverse.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatSubReverse.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatSubReverse.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatSubReverse.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatTest.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatTest.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatTest.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatTest.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatUCompare.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatUCompare.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatUCompare.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatUCompare.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatUCompareAnd2Pop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatUCompareAnd2Pop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatUCompareAnd2Pop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatUCompareAnd2Pop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatUCompareAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatUCompareAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatUCompareAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatUCompareAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatXchg.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/FloatXchg.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/FloatXchg.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/FloatXchg.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntAdd.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntAdd.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntAdd.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntAdd.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntCompare.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntCompare.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntCompare.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntCompare.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntCompareAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntCompareAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntCompareAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntCompareAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntDivide.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntDivide.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntDivide.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntDivide.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntDivideReverse.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntDivideReverse.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntDivideReverse.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntDivideReverse.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntLoad.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntLoad.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntLoad.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntLoad.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntMul.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntMul.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntMul.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntMul.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntStore.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntStore.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntStore.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntStore.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntStoreAndPop.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntStoreAndPop.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntStoreAndPop.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntStoreAndPop.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntSub.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntSub.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntSub.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntSub.cs
diff --git a/source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntSubReverse.cs b/source2/Compiler/Cosmos.Assembler.x86/x87/IntSubReverse.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Compiler.Assembler.X86/x87/IntSubReverse.cs
rename to source2/Compiler/Cosmos.Assembler.x86/x87/IntSubReverse.cs
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj b/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj
index 7f88eb5ff..cf0ee07bc 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/Cosmos.Debug.DebugStub.csproj
@@ -72,9 +72,9 @@
{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}
Cosmos.Debug.Consts
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
diff --git a/source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj b/source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj
index 35967f65e..0ffc3359f 100644
--- a/source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj
+++ b/source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj
@@ -97,9 +97,9 @@
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj b/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj
index 0aa43ebb5..145614c45 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj
+++ b/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj
@@ -294,9 +294,9 @@
{0462E82B-8C29-41A9-8265-9C89038ADB29}
Cosmos.Build.Common
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
diff --git a/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj b/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj
index 1f938d177..940773bd5 100644
--- a/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj
+++ b/source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj
@@ -74,9 +74,9 @@
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}
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 dac70262c..d20ffb737 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
@@ -101,9 +101,9 @@
-
+
{94D079E4-3C66-486A-8407-EA6EC049FF53}
- Cosmos.Compiler.Assembler.X86
+ Cosmos.Assembler.x86
{1116130E-28E0-428A-A597-F4B3B676C0CA}