diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Address.cs b/source2/Cosmos.Assembler.XSharp/Address.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Address.cs
rename to source2/Cosmos.Assembler.XSharp/Address.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/AddressDirect.cs b/source2/Cosmos.Assembler.XSharp/AddressDirect.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/AddressDirect.cs
rename to source2/Cosmos.Assembler.XSharp/AddressDirect.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/AddressIndirect.cs b/source2/Cosmos.Assembler.XSharp/AddressIndirect.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/AddressIndirect.cs
rename to source2/Cosmos.Assembler.XSharp/AddressIndirect.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/CodeBlock.cs b/source2/Cosmos.Assembler.XSharp/CodeBlock.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/CodeBlock.cs
rename to source2/Cosmos.Assembler.XSharp/CodeBlock.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/CodeGroup.cs b/source2/Cosmos.Assembler.XSharp/CodeGroup.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/CodeGroup.cs
rename to source2/Cosmos.Assembler.XSharp/CodeGroup.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj b/source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj
rename to source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj.vspscc b/source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj.vspscc
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj.vspscc
rename to source2/Cosmos.Assembler.XSharp/Cosmos.Assembler.XSharp.csproj.vspscc
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Cosmos.snk b/source2/Cosmos.Assembler.XSharp/Cosmos.snk
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Cosmos.snk
rename to source2/Cosmos.Assembler.XSharp/Cosmos.snk
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/DataMember32.cs b/source2/Cosmos.Assembler.XSharp/DataMember32.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/DataMember32.cs
rename to source2/Cosmos.Assembler.XSharp/DataMember32.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/DataMemberBase.cs b/source2/Cosmos.Assembler.XSharp/DataMemberBase.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/DataMemberBase.cs
rename to source2/Cosmos.Assembler.XSharp/DataMemberBase.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Memory.cs b/source2/Cosmos.Assembler.XSharp/Memory.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Memory.cs
rename to source2/Cosmos.Assembler.XSharp/Memory.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/MemoryAction.cs b/source2/Cosmos.Assembler.XSharp/MemoryAction.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/MemoryAction.cs
rename to source2/Cosmos.Assembler.XSharp/MemoryAction.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/PortNumber.cs b/source2/Cosmos.Assembler.XSharp/PortNumber.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/PortNumber.cs
rename to source2/Cosmos.Assembler.XSharp/PortNumber.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Ports.cs b/source2/Cosmos.Assembler.XSharp/Ports.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Ports.cs
rename to source2/Cosmos.Assembler.XSharp/Ports.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Properties/AssemblyInfo.cs b/source2/Cosmos.Assembler.XSharp/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Properties/AssemblyInfo.cs
rename to source2/Cosmos.Assembler.XSharp/Properties/AssemblyInfo.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/ReadMe.html b/source2/Cosmos.Assembler.XSharp/ReadMe.html
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/ReadMe.html
rename to source2/Cosmos.Assembler.XSharp/ReadMe.html
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Register.cs b/source2/Cosmos.Assembler.XSharp/Register.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Register.cs
rename to source2/Cosmos.Assembler.XSharp/Register.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Register08.cs b/source2/Cosmos.Assembler.XSharp/Register08.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Register08.cs
rename to source2/Cosmos.Assembler.XSharp/Register08.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Register16.cs b/source2/Cosmos.Assembler.XSharp/Register16.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Register16.cs
rename to source2/Cosmos.Assembler.XSharp/Register16.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/Register32.cs b/source2/Cosmos.Assembler.XSharp/Register32.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/Register32.cs
rename to source2/Cosmos.Assembler.XSharp/Register32.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterAL.cs b/source2/Cosmos.Assembler.XSharp/RegisterAL.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterAL.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterAL.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterAX.cs b/source2/Cosmos.Assembler.XSharp/RegisterAX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterAX.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterAX.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterBL.cs b/source2/Cosmos.Assembler.XSharp/RegisterBL.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterBL.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterBL.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterDX.cs b/source2/Cosmos.Assembler.XSharp/RegisterDX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterDX.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterDX.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterEAX.cs b/source2/Cosmos.Assembler.XSharp/RegisterEAX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterEAX.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterEAX.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterEBP.cs b/source2/Cosmos.Assembler.XSharp/RegisterEBP.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterEBP.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterEBP.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterEBX.cs b/source2/Cosmos.Assembler.XSharp/RegisterEBX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterEBX.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterEBX.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterECX.cs b/source2/Cosmos.Assembler.XSharp/RegisterECX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterECX.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterECX.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterEDI.cs b/source2/Cosmos.Assembler.XSharp/RegisterEDI.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterEDI.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterEDI.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterEDX.cs b/source2/Cosmos.Assembler.XSharp/RegisterEDX.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterEDX.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterEDX.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterESI.cs b/source2/Cosmos.Assembler.XSharp/RegisterESI.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterESI.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterESI.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/RegisterESP.cs b/source2/Cosmos.Assembler.XSharp/RegisterESP.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/RegisterESP.cs
rename to source2/Cosmos.Assembler.XSharp/RegisterESP.cs
diff --git a/source2/Compiler/Cosmos.Assembler.XSharp/XSharpAttribute.cs b/source2/Cosmos.Assembler.XSharp/XSharpAttribute.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler.XSharp/XSharpAttribute.cs
rename to source2/Cosmos.Assembler.XSharp/XSharpAttribute.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Assembler.cs b/source2/Cosmos.Assembler/Assembler.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Assembler.cs
rename to source2/Cosmos.Assembler/Assembler.cs
diff --git a/source2/Compiler/Cosmos.Assembler/BaseAssemblerElement.cs b/source2/Cosmos.Assembler/BaseAssemblerElement.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/BaseAssemblerElement.cs
rename to source2/Cosmos.Assembler/BaseAssemblerElement.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Comment.cs b/source2/Cosmos.Assembler/Comment.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Comment.cs
rename to source2/Cosmos.Assembler/Comment.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Cosmos.Assembler.csproj b/source2/Cosmos.Assembler/Cosmos.Assembler.csproj
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Cosmos.Assembler.csproj
rename to source2/Cosmos.Assembler/Cosmos.Assembler.csproj
diff --git a/source2/Compiler/Cosmos.Assembler/Cosmos.Assembler.csproj.vspscc b/source2/Cosmos.Assembler/Cosmos.Assembler.csproj.vspscc
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Cosmos.Assembler.csproj.vspscc
rename to source2/Cosmos.Assembler/Cosmos.Assembler.csproj.vspscc
diff --git a/source2/Compiler/Cosmos.Assembler/Cosmos.snk b/source2/Cosmos.Assembler/Cosmos.snk
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Cosmos.snk
rename to source2/Cosmos.Assembler/Cosmos.snk
diff --git a/source2/Compiler/Cosmos.Assembler/DataEndIfDefined.cs b/source2/Cosmos.Assembler/DataEndIfDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/DataEndIfDefined.cs
rename to source2/Cosmos.Assembler/DataEndIfDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/DataIfDefined.cs b/source2/Cosmos.Assembler/DataIfDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/DataIfDefined.cs
rename to source2/Cosmos.Assembler/DataIfDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/DataIfNotDefined.cs b/source2/Cosmos.Assembler/DataIfNotDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/DataIfNotDefined.cs
rename to source2/Cosmos.Assembler/DataIfNotDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/DataMember.cs b/source2/Cosmos.Assembler/DataMember.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/DataMember.cs
rename to source2/Cosmos.Assembler/DataMember.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Define.cs b/source2/Cosmos.Assembler/Define.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Define.cs
rename to source2/Cosmos.Assembler/Define.cs
diff --git a/source2/Compiler/Cosmos.Assembler/ElementReference.cs b/source2/Cosmos.Assembler/ElementReference.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/ElementReference.cs
rename to source2/Cosmos.Assembler/ElementReference.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Else.cs b/source2/Cosmos.Assembler/Else.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Else.cs
rename to source2/Cosmos.Assembler/Else.cs
diff --git a/source2/Compiler/Cosmos.Assembler/EndIfDefined.cs b/source2/Cosmos.Assembler/EndIfDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/EndIfDefined.cs
rename to source2/Cosmos.Assembler/EndIfDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/IDefine.cs b/source2/Cosmos.Assembler/IDefine.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/IDefine.cs
rename to source2/Cosmos.Assembler/IDefine.cs
diff --git a/source2/Compiler/Cosmos.Assembler/IEndIfDefined.cs b/source2/Cosmos.Assembler/IEndIfDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/IEndIfDefined.cs
rename to source2/Cosmos.Assembler/IEndIfDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/IIfDefined.cs b/source2/Cosmos.Assembler/IIfDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/IIfDefined.cs
rename to source2/Cosmos.Assembler/IIfDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/IIfNotDefined.cs b/source2/Cosmos.Assembler/IIfNotDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/IIfNotDefined.cs
rename to source2/Cosmos.Assembler/IIfNotDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/IfDefined.cs b/source2/Cosmos.Assembler/IfDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/IfDefined.cs
rename to source2/Cosmos.Assembler/IfDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/IfNotDefined.cs b/source2/Cosmos.Assembler/IfNotDefined.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/IfNotDefined.cs
rename to source2/Cosmos.Assembler/IfNotDefined.cs
diff --git a/source2/Compiler/Cosmos.Assembler/InfraExtensions.cs b/source2/Cosmos.Assembler/InfraExtensions.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/InfraExtensions.cs
rename to source2/Cosmos.Assembler/InfraExtensions.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Instruction.cs b/source2/Cosmos.Assembler/Instruction.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Instruction.cs
rename to source2/Cosmos.Assembler/Instruction.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Label.cs b/source2/Cosmos.Assembler/Label.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Label.cs
rename to source2/Cosmos.Assembler/Label.cs
diff --git a/source2/Compiler/Cosmos.Assembler/MethodAndTypeLabelsHolder.cs b/source2/Cosmos.Assembler/MethodAndTypeLabelsHolder.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/MethodAndTypeLabelsHolder.cs
rename to source2/Cosmos.Assembler/MethodAndTypeLabelsHolder.cs
diff --git a/source2/Compiler/Cosmos.Assembler/MethodInfoLabelGenerator.cs b/source2/Cosmos.Assembler/MethodInfoLabelGenerator.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/MethodInfoLabelGenerator.cs
rename to source2/Cosmos.Assembler/MethodInfoLabelGenerator.cs
diff --git a/source2/Compiler/Cosmos.Assembler/OpCodeAttribute.cs b/source2/Cosmos.Assembler/OpCodeAttribute.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/OpCodeAttribute.cs
rename to source2/Cosmos.Assembler/OpCodeAttribute.cs
diff --git a/source2/Compiler/Cosmos.Assembler/Properties/AssemblyInfo.cs b/source2/Cosmos.Assembler/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/Properties/AssemblyInfo.cs
rename to source2/Cosmos.Assembler/Properties/AssemblyInfo.cs
diff --git a/source2/Compiler/Cosmos.Assembler/StackContents.cs b/source2/Cosmos.Assembler/StackContents.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/StackContents.cs
rename to source2/Cosmos.Assembler/StackContents.cs
diff --git a/source2/Compiler/Cosmos.Assembler/TypeComparer.cs b/source2/Cosmos.Assembler/TypeComparer.cs
similarity index 100%
rename from source2/Compiler/Cosmos.Assembler/TypeComparer.cs
rename to source2/Cosmos.Assembler/TypeComparer.cs