diff --git a/source2/Compiler/Cosmos.XSharp/AsmGenerator.cs b/source/Compiler/Cosmos.XSharp/AsmGenerator.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/AsmGenerator.cs
rename to source/Compiler/Cosmos.XSharp/AsmGenerator.cs
diff --git a/source2/Compiler/Cosmos.XSharp/Docs/Goals.html b/source/Compiler/Cosmos.XSharp/Docs/Goals.html
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Docs/Goals.html
rename to source/Compiler/Cosmos.XSharp/Docs/Goals.html
diff --git a/source2/Compiler/Cosmos.XSharp/Docs/Old.html b/source/Compiler/Cosmos.XSharp/Docs/Old.html
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Docs/Old.html
rename to source/Compiler/Cosmos.XSharp/Docs/Old.html
diff --git a/source2/Compiler/Cosmos.XSharp/Docs/ToDo.html b/source/Compiler/Cosmos.XSharp/Docs/ToDo.html
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Docs/ToDo.html
rename to source/Compiler/Cosmos.XSharp/Docs/ToDo.html
diff --git a/source2/Compiler/Cosmos.XSharp/Docs/XSharp.htm b/source/Compiler/Cosmos.XSharp/Docs/XSharp.htm
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Docs/XSharp.htm
rename to source/Compiler/Cosmos.XSharp/Docs/XSharp.htm
diff --git a/source2/Compiler/Cosmos.XSharp/Docs/index.html b/source/Compiler/Cosmos.XSharp/Docs/index.html
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Docs/index.html
rename to source/Compiler/Cosmos.XSharp/Docs/index.html
diff --git a/source2/Compiler/Cosmos.XSharp/Parser.cs b/source/Compiler/Cosmos.XSharp/Parser.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Parser.cs
rename to source/Compiler/Cosmos.XSharp/Parser.cs
diff --git a/source2/Compiler/Cosmos.XSharp/Program.cs b/source/Compiler/Cosmos.XSharp/Program.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Program.cs
rename to source/Compiler/Cosmos.XSharp/Program.cs
diff --git a/source2/Compiler/Cosmos.XSharp/Properties/AssemblyInfo.cs b/source/Compiler/Cosmos.XSharp/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Properties/AssemblyInfo.cs
rename to source/Compiler/Cosmos.XSharp/Properties/AssemblyInfo.cs
diff --git a/source2/Compiler/Cosmos.XSharp/Token.cs b/source/Compiler/Cosmos.XSharp/Token.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/Token.cs
rename to source/Compiler/Cosmos.XSharp/Token.cs
diff --git a/source2/Compiler/Cosmos.XSharp/TokenList.cs b/source/Compiler/Cosmos.XSharp/TokenList.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/TokenList.cs
rename to source/Compiler/Cosmos.XSharp/TokenList.cs
diff --git a/source2/Compiler/Cosmos.XSharp/TokenPatterns.cs b/source/Compiler/Cosmos.XSharp/TokenPatterns.cs
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/TokenPatterns.cs
rename to source/Compiler/Cosmos.XSharp/TokenPatterns.cs
diff --git a/source2/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj b/source/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj
rename to source/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj
diff --git a/source2/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj.vspscc b/source/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj.vspscc
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj.vspscc
rename to source/Compiler/Cosmos.XSharp/XSharp.Compiler.csproj.vspscc
diff --git a/source2/Compiler/Cosmos.XSharp/XSharp.ico b/source/Compiler/Cosmos.XSharp/XSharp.ico
similarity index 100%
rename from source2/Compiler/Cosmos.XSharp/XSharp.ico
rename to source/Compiler/Cosmos.XSharp/XSharp.ico
diff --git a/XSharp/source/XSharp.Nasm/App.config b/source/XSharp.Nasm/App.config
similarity index 100%
rename from XSharp/source/XSharp.Nasm/App.config
rename to source/XSharp.Nasm/App.config
diff --git a/XSharp/source/XSharp.Nasm/Assembler.cs b/source/XSharp.Nasm/Assembler.cs
similarity index 100%
rename from XSharp/source/XSharp.Nasm/Assembler.cs
rename to source/XSharp.Nasm/Assembler.cs
diff --git a/XSharp/source/XSharp.Nasm/Cosmos.snk b/source/XSharp.Nasm/Cosmos.snk
similarity index 100%
rename from XSharp/source/XSharp.Nasm/Cosmos.snk
rename to source/XSharp.Nasm/Cosmos.snk
diff --git a/XSharp/source/XSharp.Nasm/Properties/AssemblyInfo.cs b/source/XSharp.Nasm/Properties/AssemblyInfo.cs
similarity index 100%
rename from XSharp/source/XSharp.Nasm/Properties/AssemblyInfo.cs
rename to source/XSharp.Nasm/Properties/AssemblyInfo.cs
diff --git a/XSharp/source/XSharp.Nasm/XSharp.Nasm.csproj b/source/XSharp.Nasm/XSharp.Nasm.csproj
similarity index 100%
rename from XSharp/source/XSharp.Nasm/XSharp.Nasm.csproj
rename to source/XSharp.Nasm/XSharp.Nasm.csproj
diff --git a/XSharp/source/XSharp.Nasm/XSharp.Nasm.csproj.vspscc b/source/XSharp.Nasm/XSharp.Nasm.csproj.vspscc
similarity index 100%
rename from XSharp/source/XSharp.Nasm/XSharp.Nasm.csproj.vspscc
rename to source/XSharp.Nasm/XSharp.Nasm.csproj.vspscc
diff --git a/XSharp/source/XSharp.Test/MainForm.Designer.cs b/source/XSharp.Test/MainForm.Designer.cs
similarity index 100%
rename from XSharp/source/XSharp.Test/MainForm.Designer.cs
rename to source/XSharp.Test/MainForm.Designer.cs
diff --git a/XSharp/source/XSharp.Test/MainForm.cs b/source/XSharp.Test/MainForm.cs
similarity index 100%
rename from XSharp/source/XSharp.Test/MainForm.cs
rename to source/XSharp.Test/MainForm.cs
diff --git a/XSharp/source/XSharp.Test/MainForm.resx b/source/XSharp.Test/MainForm.resx
similarity index 100%
rename from XSharp/source/XSharp.Test/MainForm.resx
rename to source/XSharp.Test/MainForm.resx
diff --git a/XSharp/source/XSharp.Test/Program.cs b/source/XSharp.Test/Program.cs
similarity index 100%
rename from XSharp/source/XSharp.Test/Program.cs
rename to source/XSharp.Test/Program.cs
diff --git a/XSharp/source/XSharp.Test/Properties/AssemblyInfo.cs b/source/XSharp.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from XSharp/source/XSharp.Test/Properties/AssemblyInfo.cs
rename to source/XSharp.Test/Properties/AssemblyInfo.cs
diff --git a/XSharp/source/XSharp.Test/Properties/Resources.Designer.cs b/source/XSharp.Test/Properties/Resources.Designer.cs
similarity index 100%
rename from XSharp/source/XSharp.Test/Properties/Resources.Designer.cs
rename to source/XSharp.Test/Properties/Resources.Designer.cs
diff --git a/XSharp/source/XSharp.Test/Properties/Resources.resx b/source/XSharp.Test/Properties/Resources.resx
similarity index 100%
rename from XSharp/source/XSharp.Test/Properties/Resources.resx
rename to source/XSharp.Test/Properties/Resources.resx
diff --git a/XSharp/source/XSharp.Test/Properties/Settings.Designer.cs b/source/XSharp.Test/Properties/Settings.Designer.cs
similarity index 100%
rename from XSharp/source/XSharp.Test/Properties/Settings.Designer.cs
rename to source/XSharp.Test/Properties/Settings.Designer.cs
diff --git a/XSharp/source/XSharp.Test/Properties/Settings.settings b/source/XSharp.Test/Properties/Settings.settings
similarity index 100%
rename from XSharp/source/XSharp.Test/Properties/Settings.settings
rename to source/XSharp.Test/Properties/Settings.settings
diff --git a/XSharp/source/XSharp.Test/XSharp.Test.csproj b/source/XSharp.Test/XSharp.Test.csproj
similarity index 100%
rename from XSharp/source/XSharp.Test/XSharp.Test.csproj
rename to source/XSharp.Test/XSharp.Test.csproj
diff --git a/XSharp/source/XSharp.Test/XSharp.Test.csproj.vspscc b/source/XSharp.Test/XSharp.Test.csproj.vspscc
similarity index 100%
rename from XSharp/source/XSharp.Test/XSharp.Test.csproj.vspscc
rename to source/XSharp.Test/XSharp.Test.csproj.vspscc
diff --git a/XSharp/source/XSharp.Test/app.config b/source/XSharp.Test/app.config
similarity index 100%
rename from XSharp/source/XSharp.Test/app.config
rename to source/XSharp.Test/app.config