diff --git a/source/Cosmos.Build.Windows/DebugConnector.cs b/source/Cosmos.Build.Windows/DebugConnector.cs
index ed2cb5dd9..aae8e7933 100644
--- a/source/Cosmos.Build.Windows/DebugConnector.cs
+++ b/source/Cosmos.Build.Windows/DebugConnector.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 namespace Cosmos.Build.Windows {
     public abstract class DebugConnector {
diff --git a/source/Cosmos.Build.Windows/DebugConnectorStream.cs b/source/Cosmos.Build.Windows/DebugConnectorStream.cs
index e87e900fe..a874cdf17 100644
--- a/source/Cosmos.Build.Windows/DebugConnectorStream.cs
+++ b/source/Cosmos.Build.Windows/DebugConnectorStream.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Windows.Threading;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 namespace Cosmos.Build.Windows {
     public abstract class DebugConnectorStream : DebugConnector {
diff --git a/source/Cosmos.Build.Windows/DebugWindow.xaml.cs b/source/Cosmos.Build.Windows/DebugWindow.xaml.cs
index a82ad96fc..d6b82c869 100644
--- a/source/Cosmos.Build.Windows/DebugWindow.xaml.cs
+++ b/source/Cosmos.Build.Windows/DebugWindow.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Shapes;
 using System.Windows.Threading;
 using System.IO;
 using Indy.IL2CPU;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 namespace Cosmos.Build.Windows {
     public partial class DebugWindow : Window {
diff --git a/source/IL2CPU/Cosmos.IL2CPU.Debug/Cosmos.Debug.csproj b/source/IL2CPU/Cosmos.IL2CPU.Debug/Cosmos.Debug.csproj
index 37aa8f95f..76d3b4841 100644
--- a/source/IL2CPU/Cosmos.IL2CPU.Debug/Cosmos.Debug.csproj
+++ b/source/IL2CPU/Cosmos.IL2CPU.Debug/Cosmos.Debug.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cosmos.IL2CPU.Debug</RootNamespace>
-    <AssemblyName>Cosmos.IL2CPU.Debug</AssemblyName>
+    <RootNamespace>Cosmos.Debug</RootNamespace>
+    <AssemblyName>Cosmos.Debug</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
diff --git a/source/IL2CPU/Cosmos.IL2CPU.Debug/Enums.cs b/source/IL2CPU/Cosmos.IL2CPU.Debug/Enums.cs
index 12a3c76d4..c1452fce7 100644
--- a/source/IL2CPU/Cosmos.IL2CPU.Debug/Enums.cs
+++ b/source/IL2CPU/Cosmos.IL2CPU.Debug/Enums.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Cosmos.IL2CPU.Debug {
+namespace Cosmos.Debug {
     // Type of message sent to client debugger
     public enum MsgType { TracePoint = 1, Message = 2, BreakPoint = 3, Error = 4 }
     // These commands come from the client debugger to OS
diff --git a/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj b/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj
index 97e26ff09..5c5d54aaa 100644
--- a/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj
+++ b/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj
@@ -53,292 +53,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="186-188AndUp\Bound.cs" />
-    <Compile Include="186-188AndUp\EnterStackFrame.cs" />
-    <Compile Include="186-188AndUp\InPortToString.cs" />
-    <Compile Include="186-188AndUp\LeaveStackFrame.cs" />
-    <Compile Include="186-188AndUp\OutStringToPort.cs" />
-    <Compile Include="186-188AndUp\PopAll.cs" />
-    <Compile Include="186-188AndUp\PushAll.cs" />
-    <Compile Include="286AndUp\AdjustRPL.cs" />
-    <Compile Include="286AndUp\ClrTaskSwitchFlag.cs" />
-    <Compile Include="286AndUp\Lgdt.cs" />
-    <Compile Include="286AndUp\Lidt.cs" />
-    <Compile Include="286AndUp\LoadAR.cs" />
-    <Compile Include="286AndUp\LoadGDT.cs" />
-    <Compile Include="286AndUp\LoadLDT.cs" />
-    <Compile Include="286AndUp\LoadMSW.cs" />
-    <Compile Include="286AndUp\LoadSegLimit.cs" />
-    <Compile Include="286AndUp\StoreGDT.cs" />
-    <Compile Include="286AndUp\StoreIDT.cs" />
-    <Compile Include="286AndUp\StoreLDT.cs" />
-    <Compile Include="286AndUp\StoreMSW.cs" />
-    <Compile Include="286AndUp\StoreTR.cs" />
-    <Compile Include="286AndUp\VerifySegForReading.cs" />
-    <Compile Include="286AndUp\VerifySegForWriting.cs" />
-    <Compile Include="286Exclusive\LoadAll.cs" />
-    <Compile Include="386AndUp\BitScanForward.cs" />
-    <Compile Include="386AndUp\BitScanReverse.cs" />
-    <Compile Include="386AndUp\BitTest.cs" />
-    <Compile Include="386AndUp\BitTestAndCompl.cs" />
-    <Compile Include="386AndUp\BitTestAndReset.cs" />
-    <Compile Include="386AndUp\BitTestAndSet.cs" />
-    <Compile Include="386AndUp\CmpStringDoubleW.cs" />
-    <Compile Include="386AndUp\DoubleWToQuadW.cs" />
-    <Compile Include="386AndUp\InvokeICE.cs" />
-    <Compile Include="386AndUp\WToDoubleW.cs" />
-    <Compile Include="386Exclusive\LoadAllD.cs" />
-    <Compile Include="3DNow!2\FloatToInt16.cs" />
-    <Compile Include="3DNow!2\Geode\Reciprocal.cs" />
-    <Compile Include="3DNow!2\Geode\ReciprocalSQRT.cs" />
-    <Compile Include="3DNow!2\Int16ToFloat.cs" />
-    <Compile Include="3DNow!2\InvertBottomTopAndStore.cs" />
-    <Compile Include="486AndUp\ByteSwap.cs" />
-    <Compile Include="486AndUp\CmpAndXchg.cs" />
-    <Compile Include="486AndUp\InvalidateCache.cs" />
-    <Compile Include="486AndUp\InvalidateTLBEntry.cs" />
-    <Compile Include="486AndUp\WBAndInvalidateCache.cs" />
-    <Compile Include="486AndUp\XchgAndAdd.cs" />
-    <Compile Include="8086Exclusive\PopCS.cs" />
-    <Compile Include="AAA.cs" />
-    <Compile Include="AAD.cs" />
-    <Compile Include="AAM.cs" />
-    <Compile Include="AAS.cs" />
-    <Compile Include="Add.cs" />
-    <Compile Include="AddWithCarry.cs" />
-    <Compile Include="AMD-MMX\MaskedMoveNotTemp.cs" />
-    <Compile Include="AMD-MMX\MoveNotTemp.cs" />
-    <Compile Include="AMD-MMX\PrefetchFullCache.cs" />
-    <Compile Include="AMD-MMX\PrefetchL1L2Cache.cs" />
-    <Compile Include="AMD-MMX\PrefetchL2Cache.cs" />
-    <Compile Include="AMD-MMX\PrefetchMultiProc.cs" />
-    <Compile Include="AMD-MMX\PrefetchNoCache.cs" />
-    <Compile Include="And.cs" />
-    <Compile Include="Assembler.cs" />
-    <Compile Include="CmpByteString.cs" />
-    <Compile Include="CmpWordString.cs" />
-    <Compile Include="EffectAddr.cs" />
-    <Compile Include="JumpOnGreater.cs" />
-    <Compile Include="K6-2AndUp\SysCall.cs" />
-    <Compile Include="K6-2AndUp\SysReturn.cs" />
-    <Compile Include="LoadESWithPointer.cs" />
-    <Compile Include="FlagIntoAH.cs" />
-    <Compile Include="LoadByte.cs" />
-    <Compile Include="LoadWord.cs" />
-    <Compile Include="Lock.cs" />
-    <Compile Include="LoopAlways.cs" />
-    <Compile Include="LoopBase.cs" />
-    <Compile Include="LoopIfEqual.cs" />
-    <Compile Include="LoopIfNotEqual.cs" />
-    <Compile Include="LoopIfNotZero.cs" />
-    <Compile Include="LoopIfZero.cs" />
-    <Compile Include="MoveSB.cs" />
-    <Compile Include="MoveSW.cs" />
-    <Compile Include="LoadPointerDS.cs" />
-    <Compile Include="PentiumAndUp\CmpAndXchg8B.cs" />
-    <Compile Include="PentiumAndUp\ReadMSR.cs" />
-    <Compile Include="PentiumAndUp\ReadTimeStampCounter.cs" />
-    <Compile Include="PentiumAndUp\WriteMSR.cs" />
-    <Compile Include="PentiumMMXAndUp\ReadPerfCounter.cs" />
-    <Compile Include="Popd.cs" />
-    <Compile Include="Pushd.cs" />
-    <Compile Include="Repeat.cs" />
-    <Compile Include="RepeatBase.cs" />
-    <Compile Include="RepeatIfEqual.cs" />
-    <Compile Include="RepeatIfNotEqual.cs" />
-    <Compile Include="RepeatIfNotZero.cs" />
-    <Compile Include="RepeatIfZero.cs" />
-    <Compile Include="RepeatMovsb.cs" />
-    <Compile Include="RepeatStosb.cs" />
-    <Compile Include="RepeatStosd.cs" />
-    <Compile Include="ReturnNear.cs" />
-    <Compile Include="SetALByCarry.cs" />
-    <Compile Include="SpecialDebug\Break.cs" />
-    <Compile Include="ConvByteToWord.cs" />
-    <Compile Include="Call.cs" />
-    <Compile Include="ClrDirFlag.cs" />
-    <Compile Include="ClrInterruptFlag.cs" />
-    <Compile Include="ClrCarryFlag.cs" />
-    <Compile Include="CmpMem.cs" />
-    <Compile Include="CmpWord.cs" />
-    <Compile Include="CmpWordInString.cs" />
-    <Compile Include="486AndUp\CmpXchg.cs" />
-    <Compile Include="Compare.cs" />
-    <Compile Include="ConditionalMove.cs" />
-    <Compile Include="Condition.cs" />
-    <Compile Include="JumpIfECXZero.cs" />
-    <Compile Include="DAA.cs" />
-    <Compile Include="DAS.cs" />
-    <Compile Include="SetDirectionFlag.cs" />
-    <Compile Include="Escape.cs" />
-    <Compile Include="Exchange.cs" />
-    <Compile Include="486AndUp\CpuId.cs" />
-    <Compile Include="Halt.cs" />
-    <Compile Include="IMultiply.cs" />
-    <Compile Include="InterruptIfOverflow.cs" />
-    <Compile Include="InvCarryFlag.cs" />
-    <Compile Include="JumpIfCXIs0.cs" />
-    <Compile Include="JumpIfECXIs0.cs" />
-    <Compile Include="JumpIfEvenParity.cs" />
-    <Compile Include="JumpIfNotAbove.cs" />
-    <Compile Include="JumpIfNotAboveOrEqual.cs" />
-    <Compile Include="JumpIfNotBelow.cs" />
-    <Compile Include="JumpIfNotBelowOrEqual.cs" />
-    <Compile Include="JumpIfNotGreater.cs" />
-    <Compile Include="JumpIfNotGreaterOrEqual.cs" />
-    <Compile Include="JumpIfNotLess.cs" />
-    <Compile Include="JumpIfNotLessOrEqual.cs" />
-    <Compile Include="JumpIfNotOverflow.cs" />
-    <Compile Include="JumpIfNotParity.cs" />
-    <Compile Include="JumpIfNotSign.cs" />
-    <Compile Include="JumpIfOddParity.cs" />
-    <Compile Include="JumpIfOverflow.cs" />
-    <Compile Include="JumpIfSign.cs" />
-    <Compile Include="286AndUp\LoadTR.cs" />
-    <Compile Include="MMX\EmptyMMXState.cs" />
-    <Compile Include="MMX\MoveDouble.cs" />
-    <Compile Include="MMX\MoveQuad.cs" />
-    <Compile Include="MMX\And.cs" />
-    <Compile Include="MMX\Nand.cs" />
-    <Compile Include="MMX\Or.cs" />
-    <Compile Include="MMX\ShiftQuadLeft.cs" />
-    <Compile Include="MMX\ShiftQuadRight.cs" />
-    <Compile Include="MMX\ShiftWordLeft.cs" />
-    <Compile Include="MMX\ShiftWordRight.cs" />
-    <Compile Include="MMX\XOr.cs" />
-    <Compile Include="386AndUp\Popfd.cs" />
-    <Compile Include="RotateThroughCarryRight.cs" />
-    <Compile Include="SpecialDebug\DebugStub.cs" />
-    <Compile Include="Dec.cs" />
-    <Compile Include="IDivide.cs" />
-    <Compile Include="InByte.cs" />
-    <Compile Include="Inc.cs" />
-    <Compile Include="InDWord.cs" />
-    <Compile Include="InWord.cs" />
-    <Compile Include="InterruptReturn.cs" />
-    <Compile Include="JumpIfAbove.cs" />
-    <Compile Include="JumpIfAboveOrEqual.cs" />
-    <Compile Include="JumpIfBelow.cs" />
-    <Compile Include="JumpIfBelowOrEqual.cs" />
-    <Compile Include="JumpIfCarry.cs" />
-    <Compile Include="JumpIfGreaterOrEqual.cs" />
-    <Compile Include="JumpIfNotZero.cs" />
-    <Compile Include="386AndUp\MoveAndSignExtend.cs" />
-    <Compile Include="386AndUp\MoveAndZeroExtend.cs" />
-    <Compile Include="Out.cs" />
-    <Compile Include="386AndUp\Popad.cs" />
-    <Compile Include="386AndUp\Pushad.cs" />
-    <Compile Include="RotateThroughCarryLeft.cs" />
-    <Compile Include="SetCarryFlag.cs" />
-    <Compile Include="ShiftAritLeft.cs" />
-    <Compile Include="ShiftAritRight.cs" />
-    <Compile Include="386AndUp\SignExtendAX.cs" />
-    <Compile Include="SingleWordToDouble.cs" />
-    <Compile Include="SetInterruptFlag.cs" />
-    <Compile Include="SSE4a\ExtractQ.cs" />
-    <Compile Include="SSE4a\InsertQ.cs" />
-    <Compile Include="SSE4a\LeadingZeroCount.cs" />
-    <Compile Include="SSE4a\MoveNTSD.cs" />
-    <Compile Include="SSE4a\MoveNTSS.cs" />
-    <Compile Include="SSE4a\PopulationCount.cs" />
-    <Compile Include="SSE4dot2\CRC32.cs" />
-    <Compile Include="SSE4dot2\PCMPESTRI.cs" />
-    <Compile Include="SSE4dot2\PCMPESTRM.cs" />
-    <Compile Include="SSE4dot2\PCMPGTQ.cs" />
-    <Compile Include="SSE4dot2\PCMPISTRI.cs" />
-    <Compile Include="SSE4dot2\PCMPISTRM.cs" />
-    <Compile Include="SSE4dot2\PopulationCount.cs" />
-    <Compile Include="SSEAndMMX2\AddPS.cs" />
-    <Compile Include="SSEAndMMX2\AddSS.cs" />
-    <Compile Include="SSEAndMMX2\CmpOrdSS.cs" />
-    <Compile Include="SSEAndMMX2\CmpPS.cs" />
-    <Compile Include="SSEAndMMX2\CmpSS.cs" />
-    <Compile Include="SSEAndMMX2\CmpUnordSS.cs" />
-    <Compile Include="SSEAndMMX2\DividePS.cs" />
-    <Compile Include="SSEAndMMX2\DivideSS.cs" />
-    <Compile Include="SSEAndMMX2\FXSave.cs" />
-    <Compile Include="SSEAndMMX2\FXStore.cs" />
-    <Compile Include="SSEAndMMX2\MaxPS.cs" />
-    <Compile Include="SSEAndMMX2\MaxSS.cs" />
-    <Compile Include="SSEAndMMX2\MinPS.cs" />
-    <Compile Include="SSEAndMMX2\MinSS.cs" />
-    <Compile Include="SSEAndMMX2\MoveAPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveHLPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveHPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveLHPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveLPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveSS.cs" />
-    <Compile Include="SSEAndMMX2\MoveUPS.cs" />
-    <Compile Include="SSEAndMMX2\MultiplyPS.cs" />
-    <Compile Include="SSEAndMMX2\MultiplySS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalPS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalSQRTPS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalSQRTSS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalSS.cs" />
-    <Compile Include="SSEAndMMX2\ShufflePS.cs" />
-    <Compile Include="SSEAndMMX2\SQRTPS.cs" />
-    <Compile Include="SSEAndMMX2\SQRTSS.cs" />
-    <Compile Include="SSEAndMMX2\SubPS.cs" />
-    <Compile Include="SSEAndMMX2\SubSS.cs" />
-    <Compile Include="SSEAndMMX2\UnpackAndILeaveHPS.cs" />
-    <Compile Include="SSEAndMMX2\UnpackAndILeaveLPS.cs" />
-    <Compile Include="StoreSD.cs" />
-    <Compile Include="StoreWordInString.cs" />
-    <Compile Include="JumpIfNotCarry.cs" />
-    <Compile Include="Interrupt.cs" />
-    <Compile Include="JumpBase.cs" />
-    <Compile Include="Not.cs" />
-    <Compile Include="386AndUp\Pushfd.cs" />
-    <Compile Include="Registers.cs" />
-    <Compile Include="ShiftLeft.cs" />
-    <Compile Include="Divide.cs" />
-    <Compile Include="Instruction.cs" />
-    <Compile Include="JumpAlways.cs" />
-    <Compile Include="JumpIfEqual.cs" />
-    <Compile Include="JumpIfGreater.cs" />
-    <Compile Include="JumpIfGreaterOrEquals.cs" />
-    <Compile Include="JumpIfLess.cs" />
-    <Compile Include="JumpIfLessOrEqual.cs" />
-    <Compile Include="JumpIfNotEquals.cs" />
-    <Compile Include="JumpIfZero.cs" />
-    <Compile Include="Move.cs" />
-    <Compile Include="Multiply.cs" />
-    <Compile Include="Neg.cs" />
-    <Compile Include="Noop.cs" />
-    <Compile Include="Or.cs" />
-    <Compile Include="Pop.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Push.cs" />
-    <Compile Include="Return.cs" />
-    <Compile Include="ShiftRight.cs" />
-    <Compile Include="StoreByteInString.cs" />
-    <Compile Include="Sub.cs" />
-    <Compile Include="SubWithCarry.cs" />
-    <Compile Include="Test.cs" />
-    <Compile Include="Wait.cs" />
-    <Compile Include="XLAT.cs" />
-    <Compile Include="Xor.cs" />
-    <Compile Include="X\MemoryAction.cs" />
-    <Compile Include="X\AddressIndirect.cs" />
-    <Compile Include="X\AddressDirect.cs" />
-    <Compile Include="X\Math.cs" />
-    <Compile Include="X\Memory.cs" />
-    <Compile Include="X\Address.cs" />
-    <Compile Include="X\Ports.cs" />
-    <Compile Include="X\PortNumber.cs" />
-    <Compile Include="X\Register.cs" />
-    <Compile Include="X\Register08.cs" />
-    <Compile Include="X\Register16.cs" />
-    <Compile Include="X\Register32.cs" />
-    <Compile Include="X\RegisterAL.cs" />
-    <Compile Include="X\RegisterDX.cs" />
-    <Compile Include="X\RegisterEAX.cs" />
-    <Compile Include="X\RegisterEBP.cs" />
-    <Compile Include="X\RegisterECX.cs" />
-    <Compile Include="X\RegisterEDX.cs" />
-    <Compile Include="X\RegisterESI.cs" />
-    <Compile Include="X\RegisterESP.cs" />
-    <Compile Include="X\Y86.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IL2CPU\Cosmos.IL2CPU.Debug\Cosmos.Debug.csproj">
diff --git a/source/Indy.IL2CPU.Assembler/Indy.IL2CPU.Assembler.csproj b/source/Indy.IL2CPU.Assembler/Indy.IL2CPU.Assembler.csproj
index e28ecfbdc..97647cf2b 100644
--- a/source/Indy.IL2CPU.Assembler/Indy.IL2CPU.Assembler.csproj
+++ b/source/Indy.IL2CPU.Assembler/Indy.IL2CPU.Assembler.csproj
@@ -51,19 +51,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Assembler.cs" />
-    <Compile Include="Comment.cs" />
-    <Compile Include="DataMember.cs" />
-    <Compile Include="RawAssembler.cs" />
-    <Compile Include="ImportMember.cs" />
-    <Compile Include="ImportMethodMember.cs" />
-    <Compile Include="Instruction.cs" />
-    <Compile Include="Label.cs" />
-    <Compile Include="Literal.cs" />
-    <Compile Include="OpCodeAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReaderWriterLocker.cs" />
-    <Compile Include="StackContent.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Cosmos.snk" />
diff --git a/source/Indy.IL2CPU.Assembler/Assembler.cs b/source/Indy.IL2CPU/Assembler/Assembler.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/Assembler.cs
rename to source/Indy.IL2CPU/Assembler/Assembler.cs
diff --git a/source/Indy.IL2CPU.Assembler/Comment.cs b/source/Indy.IL2CPU/Assembler/Comment.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/Comment.cs
rename to source/Indy.IL2CPU/Assembler/Comment.cs
diff --git a/source/Indy.IL2CPU.Assembler/DataMember.cs b/source/Indy.IL2CPU/Assembler/DataMember.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/DataMember.cs
rename to source/Indy.IL2CPU/Assembler/DataMember.cs
diff --git a/source/Indy.IL2CPU.Assembler/ImportMember.cs b/source/Indy.IL2CPU/Assembler/ImportMember.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/ImportMember.cs
rename to source/Indy.IL2CPU/Assembler/ImportMember.cs
diff --git a/source/Indy.IL2CPU.Assembler/ImportMethodMember.cs b/source/Indy.IL2CPU/Assembler/ImportMethodMember.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/ImportMethodMember.cs
rename to source/Indy.IL2CPU/Assembler/ImportMethodMember.cs
diff --git a/source/Indy.IL2CPU.Assembler/Instruction.cs b/source/Indy.IL2CPU/Assembler/Instruction.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/Instruction.cs
rename to source/Indy.IL2CPU/Assembler/Instruction.cs
diff --git a/source/Indy.IL2CPU.Assembler/Label.cs b/source/Indy.IL2CPU/Assembler/Label.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/Label.cs
rename to source/Indy.IL2CPU/Assembler/Label.cs
diff --git a/source/Indy.IL2CPU.Assembler/Literal.cs b/source/Indy.IL2CPU/Assembler/Literal.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/Literal.cs
rename to source/Indy.IL2CPU/Assembler/Literal.cs
diff --git a/source/Indy.IL2CPU.Assembler/OpCodeAttribute.cs b/source/Indy.IL2CPU/Assembler/OpCodeAttribute.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/OpCodeAttribute.cs
rename to source/Indy.IL2CPU/Assembler/OpCodeAttribute.cs
diff --git a/source/Indy.IL2CPU.Assembler/RawAssembler.cs b/source/Indy.IL2CPU/Assembler/RawAssembler.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/RawAssembler.cs
rename to source/Indy.IL2CPU/Assembler/RawAssembler.cs
diff --git a/source/Indy.IL2CPU.Assembler/ReaderWriterLocker.cs b/source/Indy.IL2CPU/Assembler/ReaderWriterLocker.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/ReaderWriterLocker.cs
rename to source/Indy.IL2CPU/Assembler/ReaderWriterLocker.cs
diff --git a/source/Indy.IL2CPU.Assembler/StackContent.cs b/source/Indy.IL2CPU/Assembler/StackContent.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler/StackContent.cs
rename to source/Indy.IL2CPU/Assembler/StackContent.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/Bound.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/Bound.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/Bound.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/Bound.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/EnterStackFrame.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/EnterStackFrame.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/EnterStackFrame.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/EnterStackFrame.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/InPortToString.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/InPortToString.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/InPortToString.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/InPortToString.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/LeaveStackFrame.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/LeaveStackFrame.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/LeaveStackFrame.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/LeaveStackFrame.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/OutStringToPort.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/OutStringToPort.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/OutStringToPort.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/OutStringToPort.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/PopAll.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/PopAll.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/PopAll.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/PopAll.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/186-188AndUp/PushAll.cs b/source/Indy.IL2CPU/Assembler/x86/186-188AndUp/PushAll.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/186-188AndUp/PushAll.cs
rename to source/Indy.IL2CPU/Assembler/x86/186-188AndUp/PushAll.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/AdjustRPL.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/AdjustRPL.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/AdjustRPL.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/AdjustRPL.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/ClrTaskSwitchFlag.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/ClrTaskSwitchFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/ClrTaskSwitchFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/ClrTaskSwitchFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/Lgdt.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/Lgdt.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/Lgdt.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/Lgdt.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/Lidt.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/Lidt.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/Lidt.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/Lidt.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadAR.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadAR.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadAR.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadAR.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadGDT.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadGDT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadGDT.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadGDT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadLDT.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadLDT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadLDT.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadLDT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadMSW.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadMSW.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadMSW.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadMSW.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadSegLimit.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadSegLimit.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadSegLimit.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadSegLimit.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadTR.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadTR.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/LoadTR.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/LoadTR.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreGDT.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreGDT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreGDT.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreGDT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreIDT.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreIDT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreIDT.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreIDT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreLDT.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreLDT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreLDT.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreLDT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreMSW.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreMSW.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreMSW.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreMSW.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreTR.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreTR.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/StoreTR.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/StoreTR.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/VerifySegForReading.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/VerifySegForReading.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/VerifySegForReading.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/VerifySegForReading.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286AndUp/VerifySegForWriting.cs b/source/Indy.IL2CPU/Assembler/x86/286AndUp/VerifySegForWriting.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286AndUp/VerifySegForWriting.cs
rename to source/Indy.IL2CPU/Assembler/x86/286AndUp/VerifySegForWriting.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/286Exclusive/LoadAll.cs b/source/Indy.IL2CPU/Assembler/x86/286Exclusive/LoadAll.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/286Exclusive/LoadAll.cs
rename to source/Indy.IL2CPU/Assembler/x86/286Exclusive/LoadAll.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/BitScanForward.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/BitScanForward.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/BitScanForward.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/BitScanForward.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/BitScanReverse.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/BitScanReverse.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/BitScanReverse.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/BitScanReverse.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTest.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTest.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTest.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTest.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTestAndCompl.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTestAndCompl.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTestAndCompl.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTestAndCompl.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTestAndReset.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTestAndReset.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTestAndReset.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTestAndReset.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTestAndSet.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTestAndSet.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/BitTestAndSet.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/BitTestAndSet.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/CmpStringDoubleW.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/CmpStringDoubleW.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/CmpStringDoubleW.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/CmpStringDoubleW.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/DoubleWToQuadW.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/DoubleWToQuadW.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/DoubleWToQuadW.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/DoubleWToQuadW.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/InvokeICE.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/InvokeICE.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/InvokeICE.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/InvokeICE.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/MoveAndSignExtend.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/MoveAndSignExtend.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/MoveAndSignExtend.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/MoveAndSignExtend.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/MoveAndZeroExtend.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/MoveAndZeroExtend.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/MoveAndZeroExtend.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/MoveAndZeroExtend.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/Popad.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/Popad.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/Popad.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/Popad.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/Popfd.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/Popfd.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/Popfd.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/Popfd.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/Pushad.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/Pushad.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/Pushad.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/Pushad.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/Pushfd.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/Pushfd.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/Pushfd.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/Pushfd.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/SignExtendAX.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/SignExtendAX.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/SignExtendAX.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/SignExtendAX.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386AndUp/WToDoubleW.cs b/source/Indy.IL2CPU/Assembler/x86/386AndUp/WToDoubleW.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386AndUp/WToDoubleW.cs
rename to source/Indy.IL2CPU/Assembler/x86/386AndUp/WToDoubleW.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/386Exclusive/LoadAllD.cs b/source/Indy.IL2CPU/Assembler/x86/386Exclusive/LoadAllD.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/386Exclusive/LoadAllD.cs
rename to source/Indy.IL2CPU/Assembler/x86/386Exclusive/LoadAllD.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/3DNow!2/FloatToInt16.cs b/source/Indy.IL2CPU/Assembler/x86/3DNow!2/FloatToInt16.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/3DNow!2/FloatToInt16.cs
rename to source/Indy.IL2CPU/Assembler/x86/3DNow!2/FloatToInt16.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/3DNow!2/Geode/Reciprocal.cs b/source/Indy.IL2CPU/Assembler/x86/3DNow!2/Geode/Reciprocal.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/3DNow!2/Geode/Reciprocal.cs
rename to source/Indy.IL2CPU/Assembler/x86/3DNow!2/Geode/Reciprocal.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/3DNow!2/Geode/ReciprocalSQRT.cs b/source/Indy.IL2CPU/Assembler/x86/3DNow!2/Geode/ReciprocalSQRT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/3DNow!2/Geode/ReciprocalSQRT.cs
rename to source/Indy.IL2CPU/Assembler/x86/3DNow!2/Geode/ReciprocalSQRT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/3DNow!2/Int16ToFloat.cs b/source/Indy.IL2CPU/Assembler/x86/3DNow!2/Int16ToFloat.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/3DNow!2/Int16ToFloat.cs
rename to source/Indy.IL2CPU/Assembler/x86/3DNow!2/Int16ToFloat.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/3DNow!2/InvertBottomTopAndStore.cs b/source/Indy.IL2CPU/Assembler/x86/3DNow!2/InvertBottomTopAndStore.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/3DNow!2/InvertBottomTopAndStore.cs
rename to source/Indy.IL2CPU/Assembler/x86/3DNow!2/InvertBottomTopAndStore.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/ByteSwap.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/ByteSwap.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/ByteSwap.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/ByteSwap.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/CmpAndXchg.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/CmpAndXchg.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/CmpAndXchg.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/CmpAndXchg.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/CmpXchg.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/CmpXchg.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/CmpXchg.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/CmpXchg.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/CpuId.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/CpuId.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/CpuId.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/CpuId.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/InvalidateCache.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/InvalidateCache.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/InvalidateCache.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/InvalidateCache.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/InvalidateTLBEntry.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/InvalidateTLBEntry.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/InvalidateTLBEntry.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/InvalidateTLBEntry.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/WBAndInvalidateCache.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/WBAndInvalidateCache.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/WBAndInvalidateCache.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/WBAndInvalidateCache.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/486AndUp/XchgAndAdd.cs b/source/Indy.IL2CPU/Assembler/x86/486AndUp/XchgAndAdd.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/486AndUp/XchgAndAdd.cs
rename to source/Indy.IL2CPU/Assembler/x86/486AndUp/XchgAndAdd.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/8086Exclusive/PopCS.cs b/source/Indy.IL2CPU/Assembler/x86/8086Exclusive/PopCS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/8086Exclusive/PopCS.cs
rename to source/Indy.IL2CPU/Assembler/x86/8086Exclusive/PopCS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AAA.cs b/source/Indy.IL2CPU/Assembler/x86/AAA.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AAA.cs
rename to source/Indy.IL2CPU/Assembler/x86/AAA.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AAD.cs b/source/Indy.IL2CPU/Assembler/x86/AAD.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AAD.cs
rename to source/Indy.IL2CPU/Assembler/x86/AAD.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AAM.cs b/source/Indy.IL2CPU/Assembler/x86/AAM.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AAM.cs
rename to source/Indy.IL2CPU/Assembler/x86/AAM.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AAS.cs b/source/Indy.IL2CPU/Assembler/x86/AAS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AAS.cs
rename to source/Indy.IL2CPU/Assembler/x86/AAS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/MaskedMoveNotTemp.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/MaskedMoveNotTemp.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/MaskedMoveNotTemp.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/MaskedMoveNotTemp.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/MoveNotTemp.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/MoveNotTemp.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/MoveNotTemp.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/MoveNotTemp.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchFullCache.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchFullCache.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchFullCache.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchFullCache.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchL1L2Cache.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchL1L2Cache.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchL1L2Cache.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchL1L2Cache.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchL2Cache.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchL2Cache.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchL2Cache.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchL2Cache.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchMultiProc.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchMultiProc.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchMultiProc.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchMultiProc.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchNoCache.cs b/source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchNoCache.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AMD-MMX/PrefetchNoCache.cs
rename to source/Indy.IL2CPU/Assembler/x86/AMD-MMX/PrefetchNoCache.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Add.cs b/source/Indy.IL2CPU/Assembler/x86/Add.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Add.cs
rename to source/Indy.IL2CPU/Assembler/x86/Add.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/AddWithCarry.cs b/source/Indy.IL2CPU/Assembler/x86/AddWithCarry.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/AddWithCarry.cs
rename to source/Indy.IL2CPU/Assembler/x86/AddWithCarry.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/And.cs b/source/Indy.IL2CPU/Assembler/x86/And.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/And.cs
rename to source/Indy.IL2CPU/Assembler/x86/And.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Assembler.cs b/source/Indy.IL2CPU/Assembler/x86/Assembler.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Assembler.cs
rename to source/Indy.IL2CPU/Assembler/x86/Assembler.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Call.cs b/source/Indy.IL2CPU/Assembler/x86/Call.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Call.cs
rename to source/Indy.IL2CPU/Assembler/x86/Call.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ClrCarryFlag.cs b/source/Indy.IL2CPU/Assembler/x86/ClrCarryFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ClrCarryFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/ClrCarryFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ClrDirFlag.cs b/source/Indy.IL2CPU/Assembler/x86/ClrDirFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ClrDirFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/ClrDirFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ClrInterruptFlag.cs b/source/Indy.IL2CPU/Assembler/x86/ClrInterruptFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ClrInterruptFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/ClrInterruptFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/CmpByteString.cs b/source/Indy.IL2CPU/Assembler/x86/CmpByteString.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/CmpByteString.cs
rename to source/Indy.IL2CPU/Assembler/x86/CmpByteString.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/CmpMem.cs b/source/Indy.IL2CPU/Assembler/x86/CmpMem.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/CmpMem.cs
rename to source/Indy.IL2CPU/Assembler/x86/CmpMem.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/CmpWord.cs b/source/Indy.IL2CPU/Assembler/x86/CmpWord.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/CmpWord.cs
rename to source/Indy.IL2CPU/Assembler/x86/CmpWord.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/CmpWordInString.cs b/source/Indy.IL2CPU/Assembler/x86/CmpWordInString.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/CmpWordInString.cs
rename to source/Indy.IL2CPU/Assembler/x86/CmpWordInString.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/CmpWordString.cs b/source/Indy.IL2CPU/Assembler/x86/CmpWordString.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/CmpWordString.cs
rename to source/Indy.IL2CPU/Assembler/x86/CmpWordString.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Compare.cs b/source/Indy.IL2CPU/Assembler/x86/Compare.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Compare.cs
rename to source/Indy.IL2CPU/Assembler/x86/Compare.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Condition.cs b/source/Indy.IL2CPU/Assembler/x86/Condition.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Condition.cs
rename to source/Indy.IL2CPU/Assembler/x86/Condition.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ConditionalMove.cs b/source/Indy.IL2CPU/Assembler/x86/ConditionalMove.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ConditionalMove.cs
rename to source/Indy.IL2CPU/Assembler/x86/ConditionalMove.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ConvByteToWord.cs b/source/Indy.IL2CPU/Assembler/x86/ConvByteToWord.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ConvByteToWord.cs
rename to source/Indy.IL2CPU/Assembler/x86/ConvByteToWord.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/DAA.cs b/source/Indy.IL2CPU/Assembler/x86/DAA.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/DAA.cs
rename to source/Indy.IL2CPU/Assembler/x86/DAA.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/DAS.cs b/source/Indy.IL2CPU/Assembler/x86/DAS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/DAS.cs
rename to source/Indy.IL2CPU/Assembler/x86/DAS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Dec.cs b/source/Indy.IL2CPU/Assembler/x86/Dec.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Dec.cs
rename to source/Indy.IL2CPU/Assembler/x86/Dec.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Divide.cs b/source/Indy.IL2CPU/Assembler/x86/Divide.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Divide.cs
rename to source/Indy.IL2CPU/Assembler/x86/Divide.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/EffectAddr.cs b/source/Indy.IL2CPU/Assembler/x86/EffectAddr.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/EffectAddr.cs
rename to source/Indy.IL2CPU/Assembler/x86/EffectAddr.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Escape.cs b/source/Indy.IL2CPU/Assembler/x86/Escape.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Escape.cs
rename to source/Indy.IL2CPU/Assembler/x86/Escape.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Exchange.cs b/source/Indy.IL2CPU/Assembler/x86/Exchange.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Exchange.cs
rename to source/Indy.IL2CPU/Assembler/x86/Exchange.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/FlagIntoAH.cs b/source/Indy.IL2CPU/Assembler/x86/FlagIntoAH.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/FlagIntoAH.cs
rename to source/Indy.IL2CPU/Assembler/x86/FlagIntoAH.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Halt.cs b/source/Indy.IL2CPU/Assembler/x86/Halt.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Halt.cs
rename to source/Indy.IL2CPU/Assembler/x86/Halt.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/IDivide.cs b/source/Indy.IL2CPU/Assembler/x86/IDivide.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/IDivide.cs
rename to source/Indy.IL2CPU/Assembler/x86/IDivide.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/IMultiply.cs b/source/Indy.IL2CPU/Assembler/x86/IMultiply.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/IMultiply.cs
rename to source/Indy.IL2CPU/Assembler/x86/IMultiply.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/InByte.cs b/source/Indy.IL2CPU/Assembler/x86/InByte.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/InByte.cs
rename to source/Indy.IL2CPU/Assembler/x86/InByte.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/InDWord.cs b/source/Indy.IL2CPU/Assembler/x86/InDWord.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/InDWord.cs
rename to source/Indy.IL2CPU/Assembler/x86/InDWord.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/InWord.cs b/source/Indy.IL2CPU/Assembler/x86/InWord.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/InWord.cs
rename to source/Indy.IL2CPU/Assembler/x86/InWord.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Inc.cs b/source/Indy.IL2CPU/Assembler/x86/Inc.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Inc.cs
rename to source/Indy.IL2CPU/Assembler/x86/Inc.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Instruction.cs b/source/Indy.IL2CPU/Assembler/x86/Instruction.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Instruction.cs
rename to source/Indy.IL2CPU/Assembler/x86/Instruction.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Interrupt.cs b/source/Indy.IL2CPU/Assembler/x86/Interrupt.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Interrupt.cs
rename to source/Indy.IL2CPU/Assembler/x86/Interrupt.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/InterruptIfOverflow.cs b/source/Indy.IL2CPU/Assembler/x86/InterruptIfOverflow.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/InterruptIfOverflow.cs
rename to source/Indy.IL2CPU/Assembler/x86/InterruptIfOverflow.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/InterruptReturn.cs b/source/Indy.IL2CPU/Assembler/x86/InterruptReturn.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/InterruptReturn.cs
rename to source/Indy.IL2CPU/Assembler/x86/InterruptReturn.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/InvCarryFlag.cs b/source/Indy.IL2CPU/Assembler/x86/InvCarryFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/InvCarryFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/InvCarryFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpAlways.cs b/source/Indy.IL2CPU/Assembler/x86/JumpAlways.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpAlways.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpAlways.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpBase.cs b/source/Indy.IL2CPU/Assembler/x86/JumpBase.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpBase.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpBase.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfAbove.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfAbove.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfAbove.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfAbove.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfAboveOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfAboveOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfAboveOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfAboveOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfBelow.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfBelow.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfBelow.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfBelow.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfBelowOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfBelowOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfBelowOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfBelowOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfCXIs0.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfCXIs0.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfCXIs0.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfCXIs0.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfCarry.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfCarry.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfCarry.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfCarry.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfECXIs0.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfECXIs0.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfECXIs0.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfECXIs0.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfECXZero.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfECXZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfECXZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfECXZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfEvenParity.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfEvenParity.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfEvenParity.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfEvenParity.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfGreater.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfGreater.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfGreater.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfGreater.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfGreaterOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfGreaterOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfGreaterOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfGreaterOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfGreaterOrEquals.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfGreaterOrEquals.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfGreaterOrEquals.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfGreaterOrEquals.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfLess.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfLess.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfLess.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfLess.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfLessOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfLessOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfLessOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfLessOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotAbove.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotAbove.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotAbove.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotAbove.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotAboveOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotAboveOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotAboveOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotAboveOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotBelow.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotBelow.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotBelow.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotBelow.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotBelowOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotBelowOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotBelowOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotBelowOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotCarry.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotCarry.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotCarry.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotCarry.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotEquals.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotEquals.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotEquals.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotEquals.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotGreater.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotGreater.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotGreater.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotGreater.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotGreaterOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotGreaterOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotGreaterOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotGreaterOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotLess.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotLess.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotLess.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotLess.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotLessOrEqual.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotLessOrEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotLessOrEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotLessOrEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotOverflow.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotOverflow.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotOverflow.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotOverflow.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotParity.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotParity.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotParity.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotParity.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotSign.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotSign.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotSign.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotSign.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfNotZero.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfNotZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfNotZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfNotZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfOddParity.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfOddParity.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfOddParity.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfOddParity.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfOverflow.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfOverflow.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfOverflow.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfOverflow.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfSign.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfSign.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfSign.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfSign.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpIfZero.cs b/source/Indy.IL2CPU/Assembler/x86/JumpIfZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpIfZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpIfZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/JumpOnGreater.cs b/source/Indy.IL2CPU/Assembler/x86/JumpOnGreater.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/JumpOnGreater.cs
rename to source/Indy.IL2CPU/Assembler/x86/JumpOnGreater.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/K6-2AndUp/SysCall.cs b/source/Indy.IL2CPU/Assembler/x86/K6-2AndUp/SysCall.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/K6-2AndUp/SysCall.cs
rename to source/Indy.IL2CPU/Assembler/x86/K6-2AndUp/SysCall.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/K6-2AndUp/SysReturn.cs b/source/Indy.IL2CPU/Assembler/x86/K6-2AndUp/SysReturn.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/K6-2AndUp/SysReturn.cs
rename to source/Indy.IL2CPU/Assembler/x86/K6-2AndUp/SysReturn.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoadByte.cs b/source/Indy.IL2CPU/Assembler/x86/LoadByte.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoadByte.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoadByte.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoadESWithPointer.cs b/source/Indy.IL2CPU/Assembler/x86/LoadESWithPointer.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoadESWithPointer.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoadESWithPointer.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoadPointerDS.cs b/source/Indy.IL2CPU/Assembler/x86/LoadPointerDS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoadPointerDS.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoadPointerDS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoadWord.cs b/source/Indy.IL2CPU/Assembler/x86/LoadWord.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoadWord.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoadWord.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Lock.cs b/source/Indy.IL2CPU/Assembler/x86/Lock.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Lock.cs
rename to source/Indy.IL2CPU/Assembler/x86/Lock.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoopAlways.cs b/source/Indy.IL2CPU/Assembler/x86/LoopAlways.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoopAlways.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoopAlways.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoopBase.cs b/source/Indy.IL2CPU/Assembler/x86/LoopBase.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoopBase.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoopBase.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoopIfEqual.cs b/source/Indy.IL2CPU/Assembler/x86/LoopIfEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoopIfEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoopIfEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoopIfNotEqual.cs b/source/Indy.IL2CPU/Assembler/x86/LoopIfNotEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoopIfNotEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoopIfNotEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoopIfNotZero.cs b/source/Indy.IL2CPU/Assembler/x86/LoopIfNotZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoopIfNotZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoopIfNotZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/LoopIfZero.cs b/source/Indy.IL2CPU/Assembler/x86/LoopIfZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/LoopIfZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/LoopIfZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/And.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/And.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/And.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/And.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/EmptyMMXState.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/EmptyMMXState.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/EmptyMMXState.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/EmptyMMXState.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/MoveDouble.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/MoveDouble.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/MoveDouble.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/MoveDouble.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/MoveQuad.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/MoveQuad.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/MoveQuad.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/MoveQuad.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/Nand.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/Nand.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/Nand.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/Nand.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/Or.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/Or.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/Or.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/Or.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/ShiftQuadLeft.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/ShiftQuadLeft.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/ShiftQuadLeft.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/ShiftQuadLeft.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/ShiftQuadRight.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/ShiftQuadRight.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/ShiftQuadRight.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/ShiftQuadRight.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/ShiftWordLeft.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/ShiftWordLeft.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/ShiftWordLeft.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/ShiftWordLeft.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/ShiftWordRight.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/ShiftWordRight.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/ShiftWordRight.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/ShiftWordRight.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MMX/XOr.cs b/source/Indy.IL2CPU/Assembler/x86/MMX/XOr.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MMX/XOr.cs
rename to source/Indy.IL2CPU/Assembler/x86/MMX/XOr.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Move.cs b/source/Indy.IL2CPU/Assembler/x86/Move.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Move.cs
rename to source/Indy.IL2CPU/Assembler/x86/Move.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MoveSB.cs b/source/Indy.IL2CPU/Assembler/x86/MoveSB.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MoveSB.cs
rename to source/Indy.IL2CPU/Assembler/x86/MoveSB.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/MoveSW.cs b/source/Indy.IL2CPU/Assembler/x86/MoveSW.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/MoveSW.cs
rename to source/Indy.IL2CPU/Assembler/x86/MoveSW.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Multiply.cs b/source/Indy.IL2CPU/Assembler/x86/Multiply.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Multiply.cs
rename to source/Indy.IL2CPU/Assembler/x86/Multiply.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Neg.cs b/source/Indy.IL2CPU/Assembler/x86/Neg.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Neg.cs
rename to source/Indy.IL2CPU/Assembler/x86/Neg.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Noop.cs b/source/Indy.IL2CPU/Assembler/x86/Noop.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Noop.cs
rename to source/Indy.IL2CPU/Assembler/x86/Noop.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Not.cs b/source/Indy.IL2CPU/Assembler/x86/Not.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Not.cs
rename to source/Indy.IL2CPU/Assembler/x86/Not.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Or.cs b/source/Indy.IL2CPU/Assembler/x86/Or.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Or.cs
rename to source/Indy.IL2CPU/Assembler/x86/Or.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Out.cs b/source/Indy.IL2CPU/Assembler/x86/Out.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Out.cs
rename to source/Indy.IL2CPU/Assembler/x86/Out.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/CmpAndXchg8B.cs b/source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/CmpAndXchg8B.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/CmpAndXchg8B.cs
rename to source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/CmpAndXchg8B.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/ReadMSR.cs b/source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/ReadMSR.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/ReadMSR.cs
rename to source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/ReadMSR.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/ReadTimeStampCounter.cs b/source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/ReadTimeStampCounter.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/ReadTimeStampCounter.cs
rename to source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/ReadTimeStampCounter.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/WriteMSR.cs b/source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/WriteMSR.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/PentiumAndUp/WriteMSR.cs
rename to source/Indy.IL2CPU/Assembler/x86/PentiumAndUp/WriteMSR.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/PentiumMMXAndUp/ReadPerfCounter.cs b/source/Indy.IL2CPU/Assembler/x86/PentiumMMXAndUp/ReadPerfCounter.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/PentiumMMXAndUp/ReadPerfCounter.cs
rename to source/Indy.IL2CPU/Assembler/x86/PentiumMMXAndUp/ReadPerfCounter.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Pop.cs b/source/Indy.IL2CPU/Assembler/x86/Pop.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Pop.cs
rename to source/Indy.IL2CPU/Assembler/x86/Pop.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Popd.cs b/source/Indy.IL2CPU/Assembler/x86/Popd.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Popd.cs
rename to source/Indy.IL2CPU/Assembler/x86/Popd.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Push.cs b/source/Indy.IL2CPU/Assembler/x86/Push.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Push.cs
rename to source/Indy.IL2CPU/Assembler/x86/Push.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Pushd.cs b/source/Indy.IL2CPU/Assembler/x86/Pushd.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Pushd.cs
rename to source/Indy.IL2CPU/Assembler/x86/Pushd.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Registers.cs b/source/Indy.IL2CPU/Assembler/x86/Registers.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Registers.cs
rename to source/Indy.IL2CPU/Assembler/x86/Registers.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Repeat.cs b/source/Indy.IL2CPU/Assembler/x86/Repeat.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Repeat.cs
rename to source/Indy.IL2CPU/Assembler/x86/Repeat.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatBase.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatBase.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatBase.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatBase.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatIfEqual.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatIfEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatIfEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatIfEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatIfNotEqual.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatIfNotEqual.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatIfNotEqual.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatIfNotEqual.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatIfNotZero.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatIfNotZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatIfNotZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatIfNotZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatIfZero.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatIfZero.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatIfZero.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatIfZero.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatMovsb.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatMovsb.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatMovsb.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatMovsb.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatStosb.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatStosb.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatStosb.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatStosb.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RepeatStosd.cs b/source/Indy.IL2CPU/Assembler/x86/RepeatStosd.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RepeatStosd.cs
rename to source/Indy.IL2CPU/Assembler/x86/RepeatStosd.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Return.cs b/source/Indy.IL2CPU/Assembler/x86/Return.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Return.cs
rename to source/Indy.IL2CPU/Assembler/x86/Return.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ReturnNear.cs b/source/Indy.IL2CPU/Assembler/x86/ReturnNear.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ReturnNear.cs
rename to source/Indy.IL2CPU/Assembler/x86/ReturnNear.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RotateThroughCarryLeft.cs b/source/Indy.IL2CPU/Assembler/x86/RotateThroughCarryLeft.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RotateThroughCarryLeft.cs
rename to source/Indy.IL2CPU/Assembler/x86/RotateThroughCarryLeft.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/RotateThroughCarryRight.cs b/source/Indy.IL2CPU/Assembler/x86/RotateThroughCarryRight.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/RotateThroughCarryRight.cs
rename to source/Indy.IL2CPU/Assembler/x86/RotateThroughCarryRight.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4a/ExtractQ.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4a/ExtractQ.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4a/ExtractQ.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4a/ExtractQ.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4a/InsertQ.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4a/InsertQ.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4a/InsertQ.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4a/InsertQ.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4a/LeadingZeroCount.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4a/LeadingZeroCount.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4a/LeadingZeroCount.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4a/LeadingZeroCount.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4a/MoveNTSD.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4a/MoveNTSD.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4a/MoveNTSD.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4a/MoveNTSD.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4a/MoveNTSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4a/MoveNTSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4a/MoveNTSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4a/MoveNTSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4a/PopulationCount.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4a/PopulationCount.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4a/PopulationCount.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4a/PopulationCount.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/CRC32.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/CRC32.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/CRC32.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/CRC32.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPESTRI.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPESTRI.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPESTRI.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPESTRI.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPESTRM.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPESTRM.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPESTRM.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPESTRM.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPGTQ.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPGTQ.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPGTQ.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPGTQ.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPISTRI.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPISTRI.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPISTRI.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPISTRI.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPISTRM.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPISTRM.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PCMPISTRM.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PCMPISTRM.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PopulationCount.cs b/source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PopulationCount.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSE4dot2/PopulationCount.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSE4dot2/PopulationCount.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/AddPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/AddPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/AddPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/AddPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/AddSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/AddSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/AddSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/AddSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpOrdSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpOrdSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpOrdSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpOrdSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpUnordSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpUnordSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/CmpUnordSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/CmpUnordSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/DividePS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/DividePS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/DividePS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/DividePS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/DivideSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/DivideSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/DivideSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/DivideSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/FXSave.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/FXSave.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/FXSave.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/FXSave.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/FXStore.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/FXStore.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/FXStore.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/FXStore.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MaxPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MaxPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MaxPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MaxPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MaxSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MaxSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MaxSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MaxSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MinPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MinPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MinPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MinPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MinSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MinSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MinSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MinSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveAPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveAPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveAPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveAPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveHLPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveHLPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveHLPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveHLPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveHPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveHPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveHPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveHPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveLHPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveLHPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveLHPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveLHPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveLPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveLPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveLPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveLPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveUPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveUPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MoveUPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MoveUPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MultiplyPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MultiplyPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MultiplyPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MultiplyPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MultiplySS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MultiplySS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/MultiplySS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/MultiplySS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalSQRTPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalSQRTPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalSQRTPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalSQRTPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalSQRTSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalSQRTSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalSQRTSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalSQRTSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ReciprocalSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ReciprocalSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SQRTPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SQRTPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SQRTPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SQRTPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SQRTSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SQRTSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SQRTSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SQRTSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ShufflePS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ShufflePS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/ShufflePS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/ShufflePS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SubPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SubPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SubPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SubPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SubSS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SubSS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/SubSS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/SubSS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/UnpackAndILeaveHPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/UnpackAndILeaveHPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/UnpackAndILeaveHPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/UnpackAndILeaveHPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/UnpackAndILeaveLPS.cs b/source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/UnpackAndILeaveLPS.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SSEAndMMX2/UnpackAndILeaveLPS.cs
rename to source/Indy.IL2CPU/Assembler/x86/SSEAndMMX2/UnpackAndILeaveLPS.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SetALByCarry.cs b/source/Indy.IL2CPU/Assembler/x86/SetALByCarry.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SetALByCarry.cs
rename to source/Indy.IL2CPU/Assembler/x86/SetALByCarry.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SetCarryFlag.cs b/source/Indy.IL2CPU/Assembler/x86/SetCarryFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SetCarryFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/SetCarryFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SetDirectionFlag.cs b/source/Indy.IL2CPU/Assembler/x86/SetDirectionFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SetDirectionFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/SetDirectionFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SetInterruptFlag.cs b/source/Indy.IL2CPU/Assembler/x86/SetInterruptFlag.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SetInterruptFlag.cs
rename to source/Indy.IL2CPU/Assembler/x86/SetInterruptFlag.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ShiftAritLeft.cs b/source/Indy.IL2CPU/Assembler/x86/ShiftAritLeft.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ShiftAritLeft.cs
rename to source/Indy.IL2CPU/Assembler/x86/ShiftAritLeft.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ShiftAritRight.cs b/source/Indy.IL2CPU/Assembler/x86/ShiftAritRight.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ShiftAritRight.cs
rename to source/Indy.IL2CPU/Assembler/x86/ShiftAritRight.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ShiftLeft.cs b/source/Indy.IL2CPU/Assembler/x86/ShiftLeft.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ShiftLeft.cs
rename to source/Indy.IL2CPU/Assembler/x86/ShiftLeft.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/ShiftRight.cs b/source/Indy.IL2CPU/Assembler/x86/ShiftRight.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/ShiftRight.cs
rename to source/Indy.IL2CPU/Assembler/x86/ShiftRight.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SingleWordToDouble.cs b/source/Indy.IL2CPU/Assembler/x86/SingleWordToDouble.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SingleWordToDouble.cs
rename to source/Indy.IL2CPU/Assembler/x86/SingleWordToDouble.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/Break.cs b/source/Indy.IL2CPU/Assembler/x86/SpecialDebug/Break.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SpecialDebug/Break.cs
rename to source/Indy.IL2CPU/Assembler/x86/SpecialDebug/Break.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs b/source/Indy.IL2CPU/Assembler/x86/SpecialDebug/DebugStub.cs
similarity index 97%
rename from source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs
rename to source/Indy.IL2CPU/Assembler/x86/SpecialDebug/DebugStub.cs
index f09d8b9b8..fd86c5976 100644
--- a/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs
+++ b/source/Indy.IL2CPU/Assembler/x86/SpecialDebug/DebugStub.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 //TODO: The asm code here is not efficient. Our first priority is to make it functionally robust and working
 // We will later optimize this
diff --git a/source/Indy.IL2CPU.Assembler.X86/StoreByteInString.cs b/source/Indy.IL2CPU/Assembler/x86/StoreByteInString.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/StoreByteInString.cs
rename to source/Indy.IL2CPU/Assembler/x86/StoreByteInString.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/StoreSD.cs b/source/Indy.IL2CPU/Assembler/x86/StoreSD.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/StoreSD.cs
rename to source/Indy.IL2CPU/Assembler/x86/StoreSD.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/StoreWordInString.cs b/source/Indy.IL2CPU/Assembler/x86/StoreWordInString.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/StoreWordInString.cs
rename to source/Indy.IL2CPU/Assembler/x86/StoreWordInString.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Sub.cs b/source/Indy.IL2CPU/Assembler/x86/Sub.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Sub.cs
rename to source/Indy.IL2CPU/Assembler/x86/Sub.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/SubWithCarry.cs b/source/Indy.IL2CPU/Assembler/x86/SubWithCarry.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/SubWithCarry.cs
rename to source/Indy.IL2CPU/Assembler/x86/SubWithCarry.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Test.cs b/source/Indy.IL2CPU/Assembler/x86/Test.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Test.cs
rename to source/Indy.IL2CPU/Assembler/x86/Test.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Wait.cs b/source/Indy.IL2CPU/Assembler/x86/Wait.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Wait.cs
rename to source/Indy.IL2CPU/Assembler/x86/Wait.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Address.cs b/source/Indy.IL2CPU/Assembler/x86/X/Address.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Address.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Address.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/AddressDirect.cs b/source/Indy.IL2CPU/Assembler/x86/X/AddressDirect.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/AddressDirect.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/AddressDirect.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/AddressIndirect.cs b/source/Indy.IL2CPU/Assembler/x86/X/AddressIndirect.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/AddressIndirect.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/AddressIndirect.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Math.cs b/source/Indy.IL2CPU/Assembler/x86/X/Math.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Math.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Math.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Memory.cs b/source/Indy.IL2CPU/Assembler/x86/X/Memory.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Memory.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Memory.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/MemoryAction.cs b/source/Indy.IL2CPU/Assembler/x86/X/MemoryAction.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/MemoryAction.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/MemoryAction.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/PortNumber.cs b/source/Indy.IL2CPU/Assembler/x86/X/PortNumber.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/PortNumber.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/PortNumber.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Ports.cs b/source/Indy.IL2CPU/Assembler/x86/X/Ports.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Ports.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Ports.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Register.cs b/source/Indy.IL2CPU/Assembler/x86/X/Register.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Register.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Register.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Register08.cs b/source/Indy.IL2CPU/Assembler/x86/X/Register08.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Register08.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Register08.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Register16.cs b/source/Indy.IL2CPU/Assembler/x86/X/Register16.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Register16.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Register16.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Register32.cs b/source/Indy.IL2CPU/Assembler/x86/X/Register32.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Register32.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Register32.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterAL.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterAL.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterAL.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterAL.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterDX.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterDX.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterDX.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterDX.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterEAX.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterEAX.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterEAX.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterEAX.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterEBP.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterEBP.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterEBP.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterEBP.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterECX.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterECX.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterECX.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterECX.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterEDX.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterEDX.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterEDX.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterEDX.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterESI.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterESI.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterESI.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterESI.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterESP.cs b/source/Indy.IL2CPU/Assembler/x86/X/RegisterESP.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/RegisterESP.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/RegisterESP.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Y86.cs b/source/Indy.IL2CPU/Assembler/x86/X/Y86.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/X/Y86.cs
rename to source/Indy.IL2CPU/Assembler/x86/X/Y86.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/XLAT.cs b/source/Indy.IL2CPU/Assembler/x86/XLAT.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/XLAT.cs
rename to source/Indy.IL2CPU/Assembler/x86/XLAT.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Xor.cs b/source/Indy.IL2CPU/Assembler/x86/Xor.cs
similarity index 100%
rename from source/Indy.IL2CPU.Assembler.X86/Xor.cs
rename to source/Indy.IL2CPU/Assembler/x86/Xor.cs
diff --git a/source/Indy.IL2CPU/Indy.IL2CPU.csproj b/source/Indy.IL2CPU/Indy.IL2CPU.csproj
index a090c085f..78b44565a 100644
--- a/source/Indy.IL2CPU/Indy.IL2CPU.csproj
+++ b/source/Indy.IL2CPU/Indy.IL2CPU.csproj
@@ -74,6 +74,10 @@
     <Compile Include="Heap.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\IL2CPU\Cosmos.IL2CPU.Debug\Cosmos.Debug.csproj">
+      <Project>{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}</Project>
+      <Name>Cosmos.Debug</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Indy.IL2CPU.Assembler.X86\Indy.IL2CPU.Assembler.X86.csproj">
       <Project>{7F32CE06-13F2-4EDA-B588-3FAAFD25178A}</Project>
       <Name>Indy.IL2CPU.Assembler.X86</Name>
@@ -84,6 +88,303 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Assembler\Assembler.cs" />
+    <Compile Include="Assembler\Comment.cs" />
+    <Compile Include="Assembler\DataMember.cs" />
+    <Compile Include="Assembler\ImportMember.cs" />
+    <Compile Include="Assembler\ImportMethodMember.cs" />
+    <Compile Include="Assembler\Instruction.cs" />
+    <Compile Include="Assembler\Label.cs" />
+    <Compile Include="Assembler\Literal.cs" />
+    <Compile Include="Assembler\OpCodeAttribute.cs" />
+    <Compile Include="Assembler\RawAssembler.cs" />
+    <Compile Include="Assembler\ReaderWriterLocker.cs" />
+    <Compile Include="Assembler\StackContent.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\Bound.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\EnterStackFrame.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\InPortToString.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\LeaveStackFrame.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\OutStringToPort.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\PopAll.cs" />
+    <Compile Include="Assembler\x86\186-188AndUp\PushAll.cs" />
+    <Compile Include="Assembler\x86\286AndUp\AdjustRPL.cs" />
+    <Compile Include="Assembler\x86\286AndUp\ClrTaskSwitchFlag.cs" />
+    <Compile Include="Assembler\x86\286AndUp\Lgdt.cs" />
+    <Compile Include="Assembler\x86\286AndUp\Lidt.cs" />
+    <Compile Include="Assembler\x86\286AndUp\LoadAR.cs" />
+    <Compile Include="Assembler\x86\286AndUp\LoadGDT.cs" />
+    <Compile Include="Assembler\x86\286AndUp\LoadLDT.cs" />
+    <Compile Include="Assembler\x86\286AndUp\LoadMSW.cs" />
+    <Compile Include="Assembler\x86\286AndUp\LoadSegLimit.cs" />
+    <Compile Include="Assembler\x86\286AndUp\LoadTR.cs" />
+    <Compile Include="Assembler\x86\286AndUp\StoreGDT.cs" />
+    <Compile Include="Assembler\x86\286AndUp\StoreIDT.cs" />
+    <Compile Include="Assembler\x86\286AndUp\StoreLDT.cs" />
+    <Compile Include="Assembler\x86\286AndUp\StoreMSW.cs" />
+    <Compile Include="Assembler\x86\286AndUp\StoreTR.cs" />
+    <Compile Include="Assembler\x86\286AndUp\VerifySegForReading.cs" />
+    <Compile Include="Assembler\x86\286AndUp\VerifySegForWriting.cs" />
+    <Compile Include="Assembler\x86\286Exclusive\LoadAll.cs" />
+    <Compile Include="Assembler\x86\386AndUp\BitScanForward.cs" />
+    <Compile Include="Assembler\x86\386AndUp\BitScanReverse.cs" />
+    <Compile Include="Assembler\x86\386AndUp\BitTest.cs" />
+    <Compile Include="Assembler\x86\386AndUp\BitTestAndCompl.cs" />
+    <Compile Include="Assembler\x86\386AndUp\BitTestAndReset.cs" />
+    <Compile Include="Assembler\x86\386AndUp\BitTestAndSet.cs" />
+    <Compile Include="Assembler\x86\386AndUp\CmpStringDoubleW.cs" />
+    <Compile Include="Assembler\x86\386AndUp\DoubleWToQuadW.cs" />
+    <Compile Include="Assembler\x86\386AndUp\InvokeICE.cs" />
+    <Compile Include="Assembler\x86\386AndUp\MoveAndSignExtend.cs" />
+    <Compile Include="Assembler\x86\386AndUp\MoveAndZeroExtend.cs" />
+    <Compile Include="Assembler\x86\386AndUp\Popad.cs" />
+    <Compile Include="Assembler\x86\386AndUp\Popfd.cs" />
+    <Compile Include="Assembler\x86\386AndUp\Pushad.cs" />
+    <Compile Include="Assembler\x86\386AndUp\Pushfd.cs" />
+    <Compile Include="Assembler\x86\386AndUp\SignExtendAX.cs" />
+    <Compile Include="Assembler\x86\386AndUp\WToDoubleW.cs" />
+    <Compile Include="Assembler\x86\386Exclusive\LoadAllD.cs" />
+    <Compile Include="Assembler\x86\3DNow!2\FloatToInt16.cs" />
+    <Compile Include="Assembler\x86\3DNow!2\Geode\Reciprocal.cs" />
+    <Compile Include="Assembler\x86\3DNow!2\Geode\ReciprocalSQRT.cs" />
+    <Compile Include="Assembler\x86\3DNow!2\Int16ToFloat.cs" />
+    <Compile Include="Assembler\x86\3DNow!2\InvertBottomTopAndStore.cs" />
+    <Compile Include="Assembler\x86\486AndUp\ByteSwap.cs" />
+    <Compile Include="Assembler\x86\486AndUp\CmpAndXchg.cs" />
+    <Compile Include="Assembler\x86\486AndUp\CmpXchg.cs" />
+    <Compile Include="Assembler\x86\486AndUp\CpuId.cs" />
+    <Compile Include="Assembler\x86\486AndUp\InvalidateCache.cs" />
+    <Compile Include="Assembler\x86\486AndUp\InvalidateTLBEntry.cs" />
+    <Compile Include="Assembler\x86\486AndUp\WBAndInvalidateCache.cs" />
+    <Compile Include="Assembler\x86\486AndUp\XchgAndAdd.cs" />
+    <Compile Include="Assembler\x86\8086Exclusive\PopCS.cs" />
+    <Compile Include="Assembler\x86\AAA.cs" />
+    <Compile Include="Assembler\x86\AAD.cs" />
+    <Compile Include="Assembler\x86\AAM.cs" />
+    <Compile Include="Assembler\x86\AAS.cs" />
+    <Compile Include="Assembler\x86\Add.cs" />
+    <Compile Include="Assembler\x86\AddWithCarry.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\MaskedMoveNotTemp.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\MoveNotTemp.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\PrefetchFullCache.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\PrefetchL1L2Cache.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\PrefetchL2Cache.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\PrefetchMultiProc.cs" />
+    <Compile Include="Assembler\x86\AMD-MMX\PrefetchNoCache.cs" />
+    <Compile Include="Assembler\x86\And.cs" />
+    <Compile Include="Assembler\x86\Assembler.cs" />
+    <Compile Include="Assembler\x86\Call.cs" />
+    <Compile Include="Assembler\x86\ClrCarryFlag.cs" />
+    <Compile Include="Assembler\x86\ClrDirFlag.cs" />
+    <Compile Include="Assembler\x86\ClrInterruptFlag.cs" />
+    <Compile Include="Assembler\x86\CmpByteString.cs" />
+    <Compile Include="Assembler\x86\CmpMem.cs" />
+    <Compile Include="Assembler\x86\CmpWord.cs" />
+    <Compile Include="Assembler\x86\CmpWordInString.cs" />
+    <Compile Include="Assembler\x86\CmpWordString.cs" />
+    <Compile Include="Assembler\x86\Compare.cs" />
+    <Compile Include="Assembler\x86\Condition.cs" />
+    <Compile Include="Assembler\x86\ConditionalMove.cs" />
+    <Compile Include="Assembler\x86\ConvByteToWord.cs" />
+    <Compile Include="Assembler\x86\DAA.cs" />
+    <Compile Include="Assembler\x86\DAS.cs" />
+    <Compile Include="Assembler\x86\Dec.cs" />
+    <Compile Include="Assembler\x86\Divide.cs" />
+    <Compile Include="Assembler\x86\EffectAddr.cs" />
+    <Compile Include="Assembler\x86\Escape.cs" />
+    <Compile Include="Assembler\x86\Exchange.cs" />
+    <Compile Include="Assembler\x86\FlagIntoAH.cs" />
+    <Compile Include="Assembler\x86\Halt.cs" />
+    <Compile Include="Assembler\x86\IDivide.cs" />
+    <Compile Include="Assembler\x86\IMultiply.cs" />
+    <Compile Include="Assembler\x86\InByte.cs" />
+    <Compile Include="Assembler\x86\Inc.cs" />
+    <Compile Include="Assembler\x86\InDWord.cs" />
+    <Compile Include="Assembler\x86\Instruction.cs" />
+    <Compile Include="Assembler\x86\Interrupt.cs" />
+    <Compile Include="Assembler\x86\InterruptIfOverflow.cs" />
+    <Compile Include="Assembler\x86\InterruptReturn.cs" />
+    <Compile Include="Assembler\x86\InvCarryFlag.cs" />
+    <Compile Include="Assembler\x86\InWord.cs" />
+    <Compile Include="Assembler\x86\JumpAlways.cs" />
+    <Compile Include="Assembler\x86\JumpBase.cs" />
+    <Compile Include="Assembler\x86\JumpIfAbove.cs" />
+    <Compile Include="Assembler\x86\JumpIfAboveOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfBelow.cs" />
+    <Compile Include="Assembler\x86\JumpIfBelowOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfCarry.cs" />
+    <Compile Include="Assembler\x86\JumpIfCXIs0.cs" />
+    <Compile Include="Assembler\x86\JumpIfECXIs0.cs" />
+    <Compile Include="Assembler\x86\JumpIfECXZero.cs" />
+    <Compile Include="Assembler\x86\JumpIfEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfEvenParity.cs" />
+    <Compile Include="Assembler\x86\JumpIfGreater.cs" />
+    <Compile Include="Assembler\x86\JumpIfGreaterOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfGreaterOrEquals.cs" />
+    <Compile Include="Assembler\x86\JumpIfLess.cs" />
+    <Compile Include="Assembler\x86\JumpIfLessOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotAbove.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotAboveOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotBelow.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotBelowOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotCarry.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotEquals.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotGreater.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotGreaterOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotLess.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotLessOrEqual.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotOverflow.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotParity.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotSign.cs" />
+    <Compile Include="Assembler\x86\JumpIfNotZero.cs" />
+    <Compile Include="Assembler\x86\JumpIfOddParity.cs" />
+    <Compile Include="Assembler\x86\JumpIfOverflow.cs" />
+    <Compile Include="Assembler\x86\JumpIfSign.cs" />
+    <Compile Include="Assembler\x86\JumpIfZero.cs" />
+    <Compile Include="Assembler\x86\JumpOnGreater.cs" />
+    <Compile Include="Assembler\x86\K6-2AndUp\SysCall.cs" />
+    <Compile Include="Assembler\x86\K6-2AndUp\SysReturn.cs" />
+    <Compile Include="Assembler\x86\LoadByte.cs" />
+    <Compile Include="Assembler\x86\LoadESWithPointer.cs" />
+    <Compile Include="Assembler\x86\LoadPointerDS.cs" />
+    <Compile Include="Assembler\x86\LoadWord.cs" />
+    <Compile Include="Assembler\x86\Lock.cs" />
+    <Compile Include="Assembler\x86\LoopAlways.cs" />
+    <Compile Include="Assembler\x86\LoopBase.cs" />
+    <Compile Include="Assembler\x86\LoopIfEqual.cs" />
+    <Compile Include="Assembler\x86\LoopIfNotEqual.cs" />
+    <Compile Include="Assembler\x86\LoopIfNotZero.cs" />
+    <Compile Include="Assembler\x86\LoopIfZero.cs" />
+    <Compile Include="Assembler\x86\MMX\And.cs" />
+    <Compile Include="Assembler\x86\MMX\EmptyMMXState.cs" />
+    <Compile Include="Assembler\x86\MMX\MoveDouble.cs" />
+    <Compile Include="Assembler\x86\MMX\MoveQuad.cs" />
+    <Compile Include="Assembler\x86\MMX\Nand.cs" />
+    <Compile Include="Assembler\x86\MMX\Or.cs" />
+    <Compile Include="Assembler\x86\MMX\ShiftQuadLeft.cs" />
+    <Compile Include="Assembler\x86\MMX\ShiftQuadRight.cs" />
+    <Compile Include="Assembler\x86\MMX\ShiftWordLeft.cs" />
+    <Compile Include="Assembler\x86\MMX\ShiftWordRight.cs" />
+    <Compile Include="Assembler\x86\MMX\XOr.cs" />
+    <Compile Include="Assembler\x86\Move.cs" />
+    <Compile Include="Assembler\x86\MoveSB.cs" />
+    <Compile Include="Assembler\x86\MoveSW.cs" />
+    <Compile Include="Assembler\x86\Multiply.cs" />
+    <Compile Include="Assembler\x86\Neg.cs" />
+    <Compile Include="Assembler\x86\Noop.cs" />
+    <Compile Include="Assembler\x86\Not.cs" />
+    <Compile Include="Assembler\x86\Or.cs" />
+    <Compile Include="Assembler\x86\Out.cs" />
+    <Compile Include="Assembler\x86\PentiumAndUp\CmpAndXchg8B.cs" />
+    <Compile Include="Assembler\x86\PentiumAndUp\ReadMSR.cs" />
+    <Compile Include="Assembler\x86\PentiumAndUp\ReadTimeStampCounter.cs" />
+    <Compile Include="Assembler\x86\PentiumAndUp\WriteMSR.cs" />
+    <Compile Include="Assembler\x86\PentiumMMXAndUp\ReadPerfCounter.cs" />
+    <Compile Include="Assembler\x86\Pop.cs" />
+    <Compile Include="Assembler\x86\Popd.cs" />
+    <Compile Include="Assembler\x86\Push.cs" />
+    <Compile Include="Assembler\x86\Pushd.cs" />
+    <Compile Include="Assembler\x86\Registers.cs" />
+    <Compile Include="Assembler\x86\Repeat.cs" />
+    <Compile Include="Assembler\x86\RepeatBase.cs" />
+    <Compile Include="Assembler\x86\RepeatIfEqual.cs" />
+    <Compile Include="Assembler\x86\RepeatIfNotEqual.cs" />
+    <Compile Include="Assembler\x86\RepeatIfNotZero.cs" />
+    <Compile Include="Assembler\x86\RepeatIfZero.cs" />
+    <Compile Include="Assembler\x86\RepeatMovsb.cs" />
+    <Compile Include="Assembler\x86\RepeatStosb.cs" />
+    <Compile Include="Assembler\x86\RepeatStosd.cs" />
+    <Compile Include="Assembler\x86\Return.cs" />
+    <Compile Include="Assembler\x86\ReturnNear.cs" />
+    <Compile Include="Assembler\x86\RotateThroughCarryLeft.cs" />
+    <Compile Include="Assembler\x86\RotateThroughCarryRight.cs" />
+    <Compile Include="Assembler\x86\SetALByCarry.cs" />
+    <Compile Include="Assembler\x86\SetCarryFlag.cs" />
+    <Compile Include="Assembler\x86\SetDirectionFlag.cs" />
+    <Compile Include="Assembler\x86\SetInterruptFlag.cs" />
+    <Compile Include="Assembler\x86\ShiftAritLeft.cs" />
+    <Compile Include="Assembler\x86\ShiftAritRight.cs" />
+    <Compile Include="Assembler\x86\ShiftLeft.cs" />
+    <Compile Include="Assembler\x86\ShiftRight.cs" />
+    <Compile Include="Assembler\x86\SingleWordToDouble.cs" />
+    <Compile Include="Assembler\x86\SpecialDebug\Break.cs" />
+    <Compile Include="Assembler\x86\SpecialDebug\DebugStub.cs" />
+    <Compile Include="Assembler\x86\SSE4a\ExtractQ.cs" />
+    <Compile Include="Assembler\x86\SSE4a\InsertQ.cs" />
+    <Compile Include="Assembler\x86\SSE4a\LeadingZeroCount.cs" />
+    <Compile Include="Assembler\x86\SSE4a\MoveNTSD.cs" />
+    <Compile Include="Assembler\x86\SSE4a\MoveNTSS.cs" />
+    <Compile Include="Assembler\x86\SSE4a\PopulationCount.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\CRC32.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\PCMPESTRI.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\PCMPESTRM.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\PCMPGTQ.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\PCMPISTRI.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\PCMPISTRM.cs" />
+    <Compile Include="Assembler\x86\SSE4dot2\PopulationCount.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\AddPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\AddSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\CmpOrdSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\CmpPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\CmpSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\CmpUnordSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\DividePS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\DivideSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\FXSave.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\FXStore.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MaxPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MaxSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MinPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MinSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveAPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveHLPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveHPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveLHPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveLPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MoveUPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MultiplyPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\MultiplySS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\ReciprocalPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\ReciprocalSQRTPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\ReciprocalSQRTSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\ReciprocalSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\ShufflePS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\SQRTPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\SQRTSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\SubPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\SubSS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\UnpackAndILeaveHPS.cs" />
+    <Compile Include="Assembler\x86\SSEAndMMX2\UnpackAndILeaveLPS.cs" />
+    <Compile Include="Assembler\x86\StoreByteInString.cs" />
+    <Compile Include="Assembler\x86\StoreSD.cs" />
+    <Compile Include="Assembler\x86\StoreWordInString.cs" />
+    <Compile Include="Assembler\x86\Sub.cs" />
+    <Compile Include="Assembler\x86\SubWithCarry.cs" />
+    <Compile Include="Assembler\x86\Test.cs" />
+    <Compile Include="Assembler\x86\Wait.cs" />
+    <Compile Include="Assembler\x86\XLAT.cs" />
+    <Compile Include="Assembler\x86\Xor.cs" />
+    <Compile Include="Assembler\x86\X\Address.cs" />
+    <Compile Include="Assembler\x86\X\AddressDirect.cs" />
+    <Compile Include="Assembler\x86\X\AddressIndirect.cs" />
+    <Compile Include="Assembler\x86\X\Math.cs" />
+    <Compile Include="Assembler\x86\X\Memory.cs" />
+    <Compile Include="Assembler\x86\X\MemoryAction.cs" />
+    <Compile Include="Assembler\x86\X\PortNumber.cs" />
+    <Compile Include="Assembler\x86\X\Ports.cs" />
+    <Compile Include="Assembler\x86\X\Register.cs" />
+    <Compile Include="Assembler\x86\X\Register08.cs" />
+    <Compile Include="Assembler\x86\X\Register16.cs" />
+    <Compile Include="Assembler\x86\X\Register32.cs" />
+    <Compile Include="Assembler\x86\X\RegisterAL.cs" />
+    <Compile Include="Assembler\x86\X\RegisterDX.cs" />
+    <Compile Include="Assembler\x86\X\RegisterEAX.cs" />
+    <Compile Include="Assembler\x86\X\RegisterEBP.cs" />
+    <Compile Include="Assembler\x86\X\RegisterECX.cs" />
+    <Compile Include="Assembler\x86\X\RegisterEDX.cs" />
+    <Compile Include="Assembler\x86\X\RegisterESI.cs" />
+    <Compile Include="Assembler\x86\X\RegisterESP.cs" />
+    <Compile Include="Assembler\x86\X\Y86.cs" />
     <Compile Include="CustomImplementation\AssemblerImpl.cs" />
     <Compile Include="CustomImplementation\Microsoft\Win32\RegistryKeyImpl.cs" />
     <Compile Include="CustomImplementation\System\ArrayImpl.cs" />
@@ -365,6 +666,18 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Assembler\x86\3DNow!\" />
+    <Folder Include="Assembler\x86\AMD-V_AndUp\" />
+    <Folder Include="Assembler\x86\Cyrix-EMMX\" />
+    <Folder Include="Assembler\x86\PentiumProAndUp\" />
+    <Folder Include="Assembler\x86\SSE2\" />
+    <Folder Include="Assembler\x86\SSE3\" />
+    <Folder Include="Assembler\x86\SSE4dot1\" />
+    <Folder Include="Assembler\x86\SSSE3\" />
+    <Folder Include="Assembler\x86\VTAndUp\" />
+    <Folder Include="Assembler\x86\x87\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.