Merge pull request #419 from mortend/organize-libs

libs: organize files
fuse-open · Aug 14, 2022 · 05da3eb · 05da3eb
2 parents 866dba9 + 0d53274
commit 05da3eb
Show file tree

Hide file tree

Showing 163 changed files with 115 additions and 120 deletions.
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/Uno.Collections.Test.unoproj b/lib/Uno.Collections/Tests/Uno.Collections.Test/Uno.Collections.Test.unoproj
diff --git a/lib/Uno.Collections/Uno.Collections.unoproj b/lib/Uno.Collections/Uno.Collections.unoproj
@@ -3,14 +3,14 @@
   "Description": "Collection extras",
   "Publisher": "Fuse Open",
   "Includes": [
-    "Extensions/EmptyEnumerable.uno:Source",
-    "Extensions/EnumerableExtensions.uno:Source",
-    "Extensions/IListExtensions.uno:Source",
-    "Extensions/OfType.uno:Source",
-    "Extensions/OrderBy.uno:Source",
-    "Extensions/Select.uno:Source",
-    "Extensions/Union.uno:Source",
-    "Extensions/Where.uno:Source",
+    "extensions/EmptyEnumerable.uno:Source",
+    "extensions/Enumerableextensions.uno:Source",
+    "extensions/IListextensions.uno:Source",
+    "extensions/OfType.uno:Source",
+    "extensions/OrderBy.uno:Source",
+    "extensions/Select.uno:Source",
+    "extensions/Union.uno:Source",
+    "extensions/Where.uno:Source",
     "ObservableList.uno:Source"
   ]
 }
diff --git a/...ollections/Extensions/EmptyEnumerable.uno → ...ollections/extensions/EmptyEnumerable.uno b/...ollections/Extensions/EmptyEnumerable.uno → ...ollections/extensions/EmptyEnumerable.uno
diff --git a/...tions/Extensions/EnumerableExtensions.uno → ...tions/extensions/EnumerableExtensions.uno b/...tions/Extensions/EnumerableExtensions.uno → ...tions/extensions/EnumerableExtensions.uno
diff --git a/...ollections/Extensions/IListExtensions.uno → ...ollections/extensions/IListExtensions.uno b/...ollections/Extensions/IListExtensions.uno → ...ollections/extensions/IListExtensions.uno
diff --git a/lib/Uno.Collections/Extensions/OfType.uno → lib/Uno.Collections/extensions/OfType.uno b/lib/Uno.Collections/Extensions/OfType.uno → lib/Uno.Collections/extensions/OfType.uno
diff --git a/lib/Uno.Collections/Extensions/OrderBy.uno → lib/Uno.Collections/extensions/OrderBy.uno b/lib/Uno.Collections/Extensions/OrderBy.uno → lib/Uno.Collections/extensions/OrderBy.uno
diff --git a/lib/Uno.Collections/Extensions/Select.uno → lib/Uno.Collections/extensions/Select.uno b/lib/Uno.Collections/Extensions/Select.uno → lib/Uno.Collections/extensions/Select.uno
diff --git a/lib/Uno.Collections/Extensions/Union.uno → lib/Uno.Collections/extensions/Union.uno b/lib/Uno.Collections/Extensions/Union.uno → lib/Uno.Collections/extensions/Union.uno
diff --git a/lib/Uno.Collections/Extensions/Where.uno → lib/Uno.Collections/extensions/Where.uno b/lib/Uno.Collections/Extensions/Where.uno → lib/Uno.Collections/extensions/Where.uno
diff --git a/....Collections.Test/ObservableList.Test.uno → ...Collections/tests/ObservableList.Test.uno b/....Collections.Test/ObservableList.Test.uno → ...Collections/tests/ObservableList.Test.uno
diff --git a/lib/Uno.Collections/tests/Uno.Collections.Test.unoproj b/lib/Uno.Collections/tests/Uno.Collections.Test.unoproj
@@ -0,0 +1,16 @@
+{
+  "Copyright": "Copyright (C) 2014",
+  "Packages": [
+    "Uno.Collections",
+    "Uno.Testing"
+  ],
+  "Includes": [
+    "ObservableList.Test.uno:Source",
+    "extensions/IListExtensions.Test.uno:Source",
+    "extensions/EnumerableExtensions.Test.uno:Source",
+    "extensions/EmptyEnumerable.Test.uno:Source",
+    "extensions/OfType.Test.uno:Source",
+    "extensions/DummyItem.uno:Source",
+    "extensions/Helpers.uno:Source"
+  ]
+}
diff --git a/...Collections.Test/Extensions/DummyItem.uno → ...ollections/tests/extensions/DummyItem.uno b/...Collections.Test/Extensions/DummyItem.uno → ...ollections/tests/extensions/DummyItem.uno
diff --git a/....Test/Extensions/EmptyEnumerable.Test.uno → ...tests/extensions/EmptyEnumerable.Test.uno b/....Test/Extensions/EmptyEnumerable.Test.uno → ...tests/extensions/EmptyEnumerable.Test.uno
diff --git a/.../Extensions/EnumerableExtensions.Test.uno → .../extensions/EnumerableExtensions.Test.uno b/.../Extensions/EnumerableExtensions.Test.uno → .../extensions/EnumerableExtensions.Test.uno
diff --git a/...o.Collections.Test/Extensions/Helpers.uno → ....Collections/tests/extensions/Helpers.uno b/...o.Collections.Test/Extensions/Helpers.uno → ....Collections/tests/extensions/Helpers.uno
diff --git a/....Test/Extensions/IListExtensions.Test.uno → ...tests/extensions/IListExtensions.Test.uno b/....Test/Extensions/IListExtensions.Test.uno → ...tests/extensions/IListExtensions.Test.uno
diff --git a/...llections.Test/Extensions/OfType.Test.uno → ...lections/tests/extensions/OfType.Test.uno b/...llections.Test/Extensions/OfType.Test.uno → ...lections/tests/extensions/OfType.Test.uno
diff --git a/lib/Uno.Data.Json/Source/JsonDataType.uno → lib/Uno.Data.Json/JsonDataType.uno b/lib/Uno.Data.Json/Source/JsonDataType.uno → lib/Uno.Data.Json/JsonDataType.uno
diff --git a/lib/Uno.Data.Json/Source/JsonException.uno → lib/Uno.Data.Json/JsonException.uno b/lib/Uno.Data.Json/Source/JsonException.uno → lib/Uno.Data.Json/JsonException.uno
diff --git a/lib/Uno.Data.Json/Source/JsonReader.uno → lib/Uno.Data.Json/JsonReader.uno b/lib/Uno.Data.Json/Source/JsonReader.uno → lib/Uno.Data.Json/JsonReader.uno
diff --git a/lib/Uno.Data.Json/Source/JsonValue.uno → lib/Uno.Data.Json/JsonValue.uno b/lib/Uno.Data.Json/Source/JsonValue.uno → lib/Uno.Data.Json/JsonValue.uno
diff --git a/lib/Uno.Data.Json/Source/JsonWriter.uno → lib/Uno.Data.Json/JsonWriter.uno b/lib/Uno.Data.Json/Source/JsonWriter.uno → lib/Uno.Data.Json/JsonWriter.uno
diff --git a/lib/Uno.Data.Json/Source/Parser.uno → lib/Uno.Data.Json/Parser.uno b/lib/Uno.Data.Json/Source/Parser.uno → lib/Uno.Data.Json/Parser.uno
diff --git a/lib/Uno.Data.Json/Uno.Data.Json.unoproj b/lib/Uno.Data.Json/Uno.Data.Json.unoproj
@@ -6,11 +6,11 @@
     "../Uno.Collections/Uno.Collections.unoproj"
   ],
   "Includes": [
-    "Source/JsonDataType.uno:Source",
-    "Source/JsonException.uno:Source",
-    "Source/JsonReader.uno:Source",
-    "Source/JsonValue.uno:Source",
-    "Source/JsonWriter.uno:Source",
-    "Source/Parser.uno:Source",
+    "JsonDataType.uno:Source",
+    "JsonException.uno:Source",
+    "JsonReader.uno:Source",
+    "JsonValue.uno:Source",
+    "JsonWriter.uno:Source",
+    "Parser.uno:Source",
   ]
 }
diff --git a/...o.Data.Json/Tests/JsonTests/JsonTests.uno → lib/Uno.Data.Json/tests/JsonTests.uno b/...o.Data.Json/Tests/JsonTests/JsonTests.uno → lib/Uno.Data.Json/tests/JsonTests.uno
diff --git a/....Json/Tests/JsonTests/TestData/test1.json → lib/Uno.Data.Json/tests/TestData/test1.json b/....Json/Tests/JsonTests/TestData/test1.json → lib/Uno.Data.Json/tests/TestData/test1.json
diff --git a/....Json/Tests/JsonTests/TestData/test2.json → lib/Uno.Data.Json/tests/TestData/test2.json b/....Json/Tests/JsonTests/TestData/test2.json → lib/Uno.Data.Json/tests/TestData/test2.json
diff --git a/....Json/Tests/JsonTests/TestData/test3.json → lib/Uno.Data.Json/tests/TestData/test3.json b/....Json/Tests/JsonTests/TestData/test3.json → lib/Uno.Data.Json/tests/TestData/test3.json
diff --git a/....Json/Tests/JsonTests/TestData/test4.json → lib/Uno.Data.Json/tests/TestData/test4.json b/....Json/Tests/JsonTests/TestData/test4.json → lib/Uno.Data.Json/tests/TestData/test4.json
diff --git a/...ests/JsonTests/Uno.Data.Json.Test.unoproj → ...ata.Json/tests/Uno.Data.Json.Test.unoproj b/...ests/JsonTests/Uno.Data.Json.Test.unoproj → ...ata.Json/tests/Uno.Data.Json.Test.unoproj
@@ -1,6 +1,5 @@
 {
   "Packages": [
-    "Uno.Data.Json",
     "Uno.Data.Json",
     "Uno.Testing"
   ],

diff --git a/lib/Uno.Data.Xml/Tests/Xml.Test.unosln b/lib/Uno.Data.Xml/Tests/Xml.Test.unosln
diff --git a/lib/Uno.Data.Xml/Uno.Data.Xml.unoproj b/lib/Uno.Data.Xml/Uno.Data.Xml.unoproj
@@ -6,35 +6,35 @@
     "../Uno.Collections/Uno.Collections.unoproj"
   ],
   "Includes": [
-    "Targets/CIL/Uno.Data.Xml.cil.uxl:Extensions",
-    "Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl:Extensions",
-    "Targets/CPlusPlus/Source/pugiconfig.hpp:File",
-    "Targets/CPlusPlus/Source/pugixml.cpp:File",
-    "Targets/CPlusPlus/Source/pugixml.hpp:File",
-    "Source/System.Xml.uno:Source",
-    "Source/XmlException.uno:Source",
-    "Source/XmlNodeImpl.uno:Source",
-    "Source/XmlNodeHandle.uno:Source",
-    "Source/XmlAttributeHandle.uno:Source",
-    "Source/XmlEnums.uno:Source",
-    "Source/Elements/XmlAttribute.uno:Source",
-    "Source/Elements/XmlValue.uno:Source",
-    "Source/Elements/XmlText.uno:Source",
-    "Source/Elements/XmlProcessingInstruction.uno:Source",
-    "Source/Elements/XmlNode.uno:Source",
-    "Source/Elements/XmlLinkedNode.uno:Source",
-    "Source/Elements/XmlElement.uno:Source",
-    "Source/Elements/XmlDocumentElement.uno:Source",
-    "Source/Elements/XmlDocument.uno:Source",
-    "Source/Elements/XmlDeclaration.uno:Source",
-    "Source/Elements/XmlComment.uno:Source",
-    "Source/Elements/XmlCharacterData.uno:Source",
-    "Source/Collections/XmlNodeCollectionBase.uno:Source",
-    "Source/Collections/XmlAttributeCollection.uno:Source",
-    "Source/Collections/XmlLinkedNodeCollection.uno:Source",
-    "Source/Helpers/AttributeHandleConverter.uno:Source",
-    "Source/Helpers/ValidationHelper.uno:Source",
-    "Source/Helpers/XmlEncodingHelper.uno:Source",
-    "Source/Helpers/XmlNodeHandleConverter.uno:Source"
+    "cil/System.Xml.uno:Source",
+    "cil/System.Xml.uxl:Extensions",
+    "cpp/pugixml.uxl:Extensions",
+    "cpp/pugiconfig.hpp:File",
+    "cpp/pugixml.cpp:File",
+    "cpp/pugixml.hpp:File",
+    "XmlException.uno:Source",
+    "XmlNodeImpl.uno:Source",
+    "XmlNodeHandle.uno:Source",
+    "XmlAttributeHandle.uno:Source",
+    "XmlEnums.uno:Source",
+    "elements/XmlAttribute.uno:Source",
+    "elements/XmlValue.uno:Source",
+    "elements/XmlText.uno:Source",
+    "elements/XmlProcessingInstruction.uno:Source",
+    "elements/XmlNode.uno:Source",
+    "elements/XmlLinkedNode.uno:Source",
+    "elements/XmlElement.uno:Source",
+    "elements/XmlDocumentElement.uno:Source",
+    "elements/XmlDocument.uno:Source",
+    "elements/XmlDeclaration.uno:Source",
+    "elements/XmlComment.uno:Source",
+    "elements/XmlCharacterData.uno:Source",
+    "collections/XmlNodeCollectionBase.uno:Source",
+    "collections/XmlAttributeCollection.uno:Source",
+    "collections/XmlLinkedNodeCollection.uno:Source",
+    "helpers/AttributeHandleConverter.uno:Source",
+    "helpers/ValidationHelper.uno:Source",
+    "helpers/XmlEncodingHelper.uno:Source",
+    "helpers/XmlNodeHandleConverter.uno:Source"
   ]
 }
diff --git a/...no.Data.Xml/Source/XmlAttributeHandle.uno → lib/Uno.Data.Xml/XmlAttributeHandle.uno b/...no.Data.Xml/Source/XmlAttributeHandle.uno → lib/Uno.Data.Xml/XmlAttributeHandle.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlEnums.uno → lib/Uno.Data.Xml/XmlEnums.uno b/lib/Uno.Data.Xml/Source/XmlEnums.uno → lib/Uno.Data.Xml/XmlEnums.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlException.uno → lib/Uno.Data.Xml/XmlException.uno b/lib/Uno.Data.Xml/Source/XmlException.uno → lib/Uno.Data.Xml/XmlException.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlNodeHandle.uno → lib/Uno.Data.Xml/XmlNodeHandle.uno b/lib/Uno.Data.Xml/Source/XmlNodeHandle.uno → lib/Uno.Data.Xml/XmlNodeHandle.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlNodeImpl.uno → lib/Uno.Data.Xml/XmlNodeImpl.uno b/lib/Uno.Data.Xml/Source/XmlNodeImpl.uno → lib/Uno.Data.Xml/XmlNodeImpl.uno
diff --git a/lib/Uno.Data.Xml/Source/System.Xml.uno → lib/Uno.Data.Xml/cil/System.Xml.uno b/lib/Uno.Data.Xml/Source/System.Xml.uno → lib/Uno.Data.Xml/cil/System.Xml.uno
diff --git a/...Data.Xml/Targets/CIL/Uno.Data.Xml.cil.uxl → lib/Uno.Data.Xml/cil/System.Xml.uxl b/...Data.Xml/Targets/CIL/Uno.Data.Xml.cil.uxl → lib/Uno.Data.Xml/cil/System.Xml.uxl
diff --git a/...ce/Collections/XmlAttributeCollection.uno → ...ml/collections/XmlAttributeCollection.uno b/...ce/Collections/XmlAttributeCollection.uno → ...ml/collections/XmlAttributeCollection.uno
diff --git a/...e/Collections/XmlLinkedNodeCollection.uno → ...l/collections/XmlLinkedNodeCollection.uno b/...e/Collections/XmlLinkedNodeCollection.uno → ...l/collections/XmlLinkedNodeCollection.uno
diff --git a/...rce/Collections/XmlNodeCollectionBase.uno → ...Xml/collections/XmlNodeCollectionBase.uno b/...rce/Collections/XmlNodeCollectionBase.uno → ...Xml/collections/XmlNodeCollectionBase.uno
diff --git a/...l/Targets/CPlusPlus/Source/pugiconfig.hpp → lib/Uno.Data.Xml/cpp/pugiconfig.hpp b/...l/Targets/CPlusPlus/Source/pugiconfig.hpp → lib/Uno.Data.Xml/cpp/pugiconfig.hpp
diff --git a/....Xml/Targets/CPlusPlus/Source/pugixml.cpp → lib/Uno.Data.Xml/cpp/pugixml.cpp b/....Xml/Targets/CPlusPlus/Source/pugixml.cpp → lib/Uno.Data.Xml/cpp/pugixml.cpp
@@ -14,7 +14,7 @@
 #ifndef SOURCE_PUGIXML_CPP
 #define SOURCE_PUGIXML_CPP
 
-#include "Source/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/....Xml/Targets/CPlusPlus/Source/pugixml.hpp → lib/Uno.Data.Xml/cpp/pugixml.hpp b/....Xml/Targets/CPlusPlus/Source/pugixml.hpp → lib/Uno.Data.Xml/cpp/pugixml.hpp
diff --git a/...ml/Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl → lib/Uno.Data.Xml/cpp/pugixml.uxl b/...ml/Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl → lib/Uno.Data.Xml/cpp/pugixml.uxl
@@ -4,11 +4,11 @@
     <Type Name="Uno.Data.Xml.XmlNodeHandle" />
     <Type Name="Uno.Data.Xml.XmlAttributeHandle" />
     <Type Name="Uno.Data.Xml.XmlNodeImpl">
-        <CopyFile Type="HeaderFile" Name="Source/pugixml.hpp" />
-        <CopyFile Type="HeaderFile" Name="Source/pugiconfig.hpp" />
-        <CopyFile Type="SourceFile" Name="Source/pugixml.cpp" />
+        <CopyFile Type="HeaderFile" Name="pugixml.hpp" />
+        <CopyFile Type="HeaderFile" Name="pugiconfig.hpp" />
+        <CopyFile Type="SourceFile" Name="pugixml.cpp" />
 
-        <Require Source.Include="Source/pugixml.hpp" />
+        <Require Source.Include="pugixml.hpp" />
 
         <Method Signature="Parse(string):XmlNodeHandle">
             <Require Source.Include="@{Uno.Data.Xml.XmlException:Include}" />

diff --git a/...Data.Xml/Source/Elements/XmlAttribute.uno → lib/Uno.Data.Xml/elements/XmlAttribute.uno b/...Data.Xml/Source/Elements/XmlAttribute.uno → lib/Uno.Data.Xml/elements/XmlAttribute.uno
diff --git a/....Xml/Source/Elements/XmlCharacterData.uno → ...no.Data.Xml/elements/XmlCharacterData.uno b/....Xml/Source/Elements/XmlCharacterData.uno → ...no.Data.Xml/elements/XmlCharacterData.uno
diff --git a/...o.Data.Xml/Source/Elements/XmlComment.uno → lib/Uno.Data.Xml/elements/XmlComment.uno b/...o.Data.Xml/Source/Elements/XmlComment.uno → lib/Uno.Data.Xml/elements/XmlComment.uno
diff --git a/...ta.Xml/Source/Elements/XmlDeclaration.uno → lib/Uno.Data.Xml/elements/XmlDeclaration.uno b/...ta.Xml/Source/Elements/XmlDeclaration.uno → lib/Uno.Data.Xml/elements/XmlDeclaration.uno
diff --git a/....Data.Xml/Source/Elements/XmlDocument.uno → lib/Uno.Data.Xml/elements/XmlDocument.uno b/....Data.Xml/Source/Elements/XmlDocument.uno → lib/Uno.Data.Xml/elements/XmlDocument.uno
diff --git a/...ml/Source/Elements/XmlDocumentElement.uno → ....Data.Xml/elements/XmlDocumentElement.uno b/...ml/Source/Elements/XmlDocumentElement.uno → ....Data.Xml/elements/XmlDocumentElement.uno
diff --git a/...o.Data.Xml/Source/Elements/XmlElement.uno → lib/Uno.Data.Xml/elements/XmlElement.uno b/...o.Data.Xml/Source/Elements/XmlElement.uno → lib/Uno.Data.Xml/elements/XmlElement.uno
diff --git a/...ata.Xml/Source/Elements/XmlLinkedNode.uno → lib/Uno.Data.Xml/elements/XmlLinkedNode.uno b/...ata.Xml/Source/Elements/XmlLinkedNode.uno → lib/Uno.Data.Xml/elements/XmlLinkedNode.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlNode.uno → lib/Uno.Data.Xml/elements/XmlNode.uno b/lib/Uno.Data.Xml/Source/Elements/XmlNode.uno → lib/Uno.Data.Xml/elements/XmlNode.uno
diff --git a/...rce/Elements/XmlProcessingInstruction.uno → ...Xml/elements/XmlProcessingInstruction.uno b/...rce/Elements/XmlProcessingInstruction.uno → ...Xml/elements/XmlProcessingInstruction.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlText.uno → lib/Uno.Data.Xml/elements/XmlText.uno b/lib/Uno.Data.Xml/Source/Elements/XmlText.uno → lib/Uno.Data.Xml/elements/XmlText.uno
diff --git a/...Uno.Data.Xml/Source/Elements/XmlValue.uno → lib/Uno.Data.Xml/elements/XmlValue.uno b/...Uno.Data.Xml/Source/Elements/XmlValue.uno → lib/Uno.Data.Xml/elements/XmlValue.uno
diff --git a/...urce/Helpers/AttributeHandleConverter.uno → ....Xml/helpers/AttributeHandleConverter.uno b/...urce/Helpers/AttributeHandleConverter.uno → ....Xml/helpers/AttributeHandleConverter.uno
diff --git a/...a.Xml/Source/Helpers/ValidationHelper.uno → ...Uno.Data.Xml/helpers/ValidationHelper.uno b/...a.Xml/Source/Helpers/ValidationHelper.uno → ...Uno.Data.Xml/helpers/ValidationHelper.uno
diff --git a/....Xml/Source/Helpers/XmlEncodingHelper.uno → ...no.Data.Xml/helpers/XmlEncodingHelper.uno b/....Xml/Source/Helpers/XmlEncodingHelper.uno → ...no.Data.Xml/helpers/XmlEncodingHelper.uno
diff --git a/...Source/Helpers/XmlNodeHandleConverter.uno → ...ta.Xml/helpers/XmlNodeHandleConverter.uno b/...Source/Helpers/XmlNodeHandleConverter.uno → ...ta.Xml/helpers/XmlNodeHandleConverter.uno
diff --git a/....Data.Xml/Tests/Xml.Test/Xml.Test.unoproj → lib/Uno.Data.Xml/tests/Xml.Test.unoproj b/....Data.Xml/Tests/Xml.Test/Xml.Test.unoproj → lib/Uno.Data.Xml/tests/Xml.Test.unoproj
diff --git a/...a.Xml/Tests/Xml.Test/XmlDocumentTests.uno → lib/Uno.Data.Xml/tests/XmlDocumentTests.uno b/...a.Xml/Tests/Xml.Test/XmlDocumentTests.uno → lib/Uno.Data.Xml/tests/XmlDocumentTests.uno
diff --git a/lib/Uno.Graphics.Utils/Uno.Graphics.Utils.unoproj b/lib/Uno.Graphics.Utils/Uno.Graphics.Utils.unoproj
@@ -4,13 +4,13 @@
   ],
   "Includes": [
     "Bitmap.uno:Source",
-    "Cpp/CppFontFace.uno:Source",
-    "Cpp/CppTexture.uno:Source",
-    "DotNet/DotNetFontFace.uno:Source",
-    "DotNet/DotNetTexture.uno:Source",
-    "DotNet/Uno.Native.stuff:Stuff",
-    "DotNet/Uno.Native.uno:Source",
-    "DotNet/Uno.Native.uxl:Extensions",
+    "cpp/CppFontFace.uno:Source",
+    "cpp/CppTexture.uno:Source",
+    "dotnet/DotNetFontFace.uno:Source",
+    "dotnet/DotNetTexture.uno:Source",
+    "dotnet/Uno.Native.stuff:Stuff",
+    "dotnet/Uno.Native.uno:Source",
+    "dotnet/Uno.Native.uxl:Extensions",
     "FontLoader.uno:Source",
     "Text/BitmapFont.uno:Source",
     "Text/DefaultTextTransform.uno:Source",

diff --git a/lib/Uno.Graphics.Utils/Cpp/CppFontFace.uno → lib/Uno.Graphics.Utils/cpp/CppFontFace.uno b/lib/Uno.Graphics.Utils/Cpp/CppFontFace.uno → lib/Uno.Graphics.Utils/cpp/CppFontFace.uno
diff --git a/lib/Uno.Graphics.Utils/Cpp/CppTexture.uno → lib/Uno.Graphics.Utils/cpp/CppTexture.uno b/lib/Uno.Graphics.Utils/Cpp/CppTexture.uno → lib/Uno.Graphics.Utils/cpp/CppTexture.uno
diff --git a/lib/Uno.Graphics.Utils/DotNet/.gitignore → lib/Uno.Graphics.Utils/dotnet/.gitignore b/lib/Uno.Graphics.Utils/DotNet/.gitignore → lib/Uno.Graphics.Utils/dotnet/.gitignore
diff --git a/....Graphics.Utils/DotNet/DotNetFontFace.uno → ....Graphics.Utils/dotnet/DotNetFontFace.uno b/....Graphics.Utils/DotNet/DotNetFontFace.uno → ....Graphics.Utils/dotnet/DotNetFontFace.uno
diff --git a/...o.Graphics.Utils/DotNet/DotNetTexture.uno → ...o.Graphics.Utils/dotnet/DotNetTexture.uno b/...o.Graphics.Utils/DotNet/DotNetTexture.uno → ...o.Graphics.Utils/dotnet/DotNetTexture.uno
diff --git a/...no.Graphics.Utils/DotNet/Uno.Native.stuff → ...no.Graphics.Utils/dotnet/Uno.Native.stuff b/...no.Graphics.Utils/DotNet/Uno.Native.stuff → ...no.Graphics.Utils/dotnet/Uno.Native.stuff
diff --git a/lib/Uno.Graphics.Utils/DotNet/Uno.Native.uno → lib/Uno.Graphics.Utils/dotnet/Uno.Native.uno b/lib/Uno.Graphics.Utils/DotNet/Uno.Native.uno → lib/Uno.Graphics.Utils/dotnet/Uno.Native.uno
diff --git a/lib/Uno.Graphics.Utils/DotNet/Uno.Native.uxl → lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl b/lib/Uno.Graphics.Utils/DotNet/Uno.Native.uxl → lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl
diff --git a/....Net.Http/Implementation/IHttpRequest.uno → lib/Uno.Net.Http/IHttpRequest.uno b/....Net.Http/Implementation/IHttpRequest.uno → lib/Uno.Net.Http/IHttpRequest.uno
diff --git a/lib/Uno.Net.Http/Uno.Net.Http.unoproj b/lib/Uno.Net.Http/Uno.Net.Http.unoproj
@@ -16,27 +16,27 @@
     "HttpResponseType.uno:Source",
     "HttpStatusReasonPhrase.uno:Source",
     "HttpDefaultDispatcher.uno:Source",
-    "Implementation/Android/AndroidHttpRequest.uno:Source",
-    "Implementation/Android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java:File",
-    "Implementation/Android/ExperimentalHttp/DownloadTask.java:File",
-    "Implementation/Android/ExperimentalHttp/HttpRequest.cpp.uxl:Extensions",
-    "Implementation/Android/ExperimentalHttp/HttpRequest.java:File",
-    "Implementation/Android/ExperimentalHttp/HttpRequest.uno:Source",
-    "Implementation/Android/ExperimentalHttp/PRNGFixes.java:File",
-    "Implementation/Android/ExperimentalHttp/UploadTask.java:File",
-    "Implementation/Cil/CilHttpRequest.cil.uxl:Extensions",
-    "Implementation/Cil/CilHttpRequest.uno:Source",
-    "Implementation/Cil/Uno.Net.Http.Implementation.dll:File",
-    "Implementation/IHttpRequest.uno:Source",
-    "Implementation/iOS/HttpRequest.h:File",
-    "Implementation/iOS/HttpRequest.mm:File",
-    "Implementation/iOS/iOSHttpRequest.cpp.uxl:Extensions",
-    "Implementation/iOS/iOSHttpRequest.uno:Source",
-    "Implementation/iOS/iOSHttpSharedCache.cpp.uxl:Extensions",
-    "Implementation/iOS/iOSHttpSharedCache.uno:Source",
-    "Implementation/Xli/XliHttpEventHandler.h:File",
-    "Implementation/Xli/XliHttpRequest.cpp.uxl:Extensions",
-    "Implementation/Xli/XliHttpRequest.uno:Source",
+    "android/AndroidHttpRequest.uno:Source",
+    "android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java:File",
+    "android/ExperimentalHttp/DownloadTask.java:File",
+    "android/ExperimentalHttp/HttpRequest.cpp.uxl:Extensions",
+    "android/ExperimentalHttp/HttpRequest.java:File",
+    "android/ExperimentalHttp/HttpRequest.uno:Source",
+    "android/ExperimentalHttp/PRNGFixes.java:File",
+    "android/ExperimentalHttp/UploadTask.java:File",
+    "cil/CilHttpRequest.cil.uxl:Extensions",
+    "cil/CilHttpRequest.uno:Source",
+    "cil/Uno.Net.Http.Implementation.dll:File",
+    "IHttpRequest.uno:Source",
+    "ios/HttpRequest.h:File",
+    "ios/HttpRequest.mm:File",
+    "ios/iOSHttpRequest.cpp.uxl:Extensions",
+    "ios/iOSHttpRequest.uno:Source",
+    "ios/iOSHttpSharedCache.cpp.uxl:Extensions",
+    "ios/iOSHttpSharedCache.uno:Source",
+    "cpp/XliHttpEventHandler.h:File",
+    "cpp/XliHttpRequest.cpp.uxl:Extensions",
+    "cpp/XliHttpRequest.uno:Source",
     "Uri.uno:Source",
     "UriFormatException.uno:Source",
     "UriHelper.uno:Source",

diff --git a/...ementation/Android/AndroidHttpRequest.uno → ...o.Net.Http/android/AndroidHttpRequest.uno b/...ementation/Android/AndroidHttpRequest.uno → ...o.Net.Http/android/AndroidHttpRequest.uno
diff --git a/...om_fuse_ExperimentalHttp_HttpRequest.java → ...om_fuse_ExperimentalHttp_HttpRequest.java b/...om_fuse_ExperimentalHttp_HttpRequest.java → ...om_fuse_ExperimentalHttp_HttpRequest.java
diff --git a/...ndroid/ExperimentalHttp/DownloadTask.java → ...ndroid/ExperimentalHttp/DownloadTask.java b/...ndroid/ExperimentalHttp/DownloadTask.java → ...ndroid/ExperimentalHttp/DownloadTask.java
diff --git a/...roid/ExperimentalHttp/HttpRequest.cpp.uxl → ...roid/ExperimentalHttp/HttpRequest.cpp.uxl b/...roid/ExperimentalHttp/HttpRequest.cpp.uxl → ...roid/ExperimentalHttp/HttpRequest.cpp.uxl
diff --git a/...Android/ExperimentalHttp/HttpRequest.java → ...android/ExperimentalHttp/HttpRequest.java b/...Android/ExperimentalHttp/HttpRequest.java → ...android/ExperimentalHttp/HttpRequest.java
diff --git a/.../Android/ExperimentalHttp/HttpRequest.uno → .../android/ExperimentalHttp/HttpRequest.uno b/.../Android/ExperimentalHttp/HttpRequest.uno → .../android/ExperimentalHttp/HttpRequest.uno
diff --git a/...n/Android/ExperimentalHttp/PRNGFixes.java → ...p/android/ExperimentalHttp/PRNGFixes.java b/...n/Android/ExperimentalHttp/PRNGFixes.java → ...p/android/ExperimentalHttp/PRNGFixes.java
diff --git a/.../Android/ExperimentalHttp/UploadTask.java → .../android/ExperimentalHttp/UploadTask.java b/.../Android/ExperimentalHttp/UploadTask.java → .../android/ExperimentalHttp/UploadTask.java
diff --git a/...Implementation/Cil/CilHttpRequest.cil.uxl → lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl b/...Implementation/Cil/CilHttpRequest.cil.uxl → lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl
diff --git a/...ttp/Implementation/Cil/CilHttpRequest.uno → lib/Uno.Net.Http/cil/CilHttpRequest.uno b/...ttp/Implementation/Cil/CilHttpRequest.uno → lib/Uno.Net.Http/cil/CilHttpRequest.uno
diff --git a/...o.Net.Http.Implementation.Test/App.config → ...o.Net.Http.Implementation.Test/App.config b/...o.Net.Http.Implementation.Test/App.config → ...o.Net.Http.Implementation.Test/App.config
diff --git a/...o.Net.Http.Implementation.Test/Program.cs → ...o.Net.Http.Implementation.Test/Program.cs b/...o.Net.Http.Implementation.Test/Program.cs → ...o.Net.Http.Implementation.Test/Program.cs
diff --git a/...mentation.Test/Properties/AssemblyInfo.cs → ...mentation.Test/Properties/AssemblyInfo.cs b/...mentation.Test/Properties/AssemblyInfo.cs → ...mentation.Test/Properties/AssemblyInfo.cs
diff --git a/...t/Uno.Net.Http.Implementation.Test.csproj → ...t/Uno.Net.Http.Implementation.Test.csproj b/...t/Uno.Net.Http.Implementation.Test.csproj → ...t/Uno.Net.Http.Implementation.Test.csproj
diff --git a/...ation/Cil/Uno.Net.Http.Implementation.dll → ....Http/cil/Uno.Net.Http.Implementation.dll b/...ation/Cil/Uno.Net.Http.Implementation.dll → ....Http/cil/Uno.Net.Http.Implementation.dll
diff --git a/...ation/Cil/Uno.Net.Http.Implementation.sln → ....Http/cil/Uno.Net.Http.Implementation.sln b/...ation/Cil/Uno.Net.Http.Implementation.sln → ....Http/cil/Uno.Net.Http.Implementation.sln
diff --git a/...Net.Http.Implementation/HttpClientImpl.cs → ...Net.Http.Implementation/HttpClientImpl.cs b/...Net.Http.Implementation/HttpClientImpl.cs → ...Net.Http.Implementation/HttpClientImpl.cs
diff --git a/...tp.Implementation/MyHttpLib/HttpHelper.cs → ...tp.Implementation/MyHttpLib/HttpHelper.cs b/...tp.Implementation/MyHttpLib/HttpHelper.cs → ...tp.Implementation/MyHttpLib/HttpHelper.cs
diff --git a/...p.Implementation/MyHttpLib/HttpRequest.cs → ...p.Implementation/MyHttpLib/HttpRequest.cs b/...p.Implementation/MyHttpLib/HttpRequest.cs → ...p.Implementation/MyHttpLib/HttpRequest.cs
diff --git a/....Implementation/MyHttpLib/HttpResponse.cs → ....Implementation/MyHttpLib/HttpResponse.cs b/....Implementation/MyHttpLib/HttpResponse.cs → ....Implementation/MyHttpLib/HttpResponse.cs
diff --git a/...lementation/MyHttpLib/StreamExtensions.cs → ...lementation/MyHttpLib/StreamExtensions.cs b/...lementation/MyHttpLib/StreamExtensions.cs → ...lementation/MyHttpLib/StreamExtensions.cs
diff --git a/...plementation/MyHttpLib/TaskAsyncHelper.cs → ...plementation/MyHttpLib/TaskAsyncHelper.cs b/...plementation/MyHttpLib/TaskAsyncHelper.cs → ...plementation/MyHttpLib/TaskAsyncHelper.cs
diff --git a/...Implementation/Properties/AssemblyInfo.cs → ...Implementation/Properties/AssemblyInfo.cs b/...Implementation/Properties/AssemblyInfo.cs → ...Implementation/Properties/AssemblyInfo.cs
diff --git a/...tation/Uno.Net.Http.Implementation.csproj → ...tation/Uno.Net.Http.Implementation.csproj b/...tation/Uno.Net.Http.Implementation.csproj → ...tation/Uno.Net.Http.Implementation.csproj
diff --git a/.../Implementation/Xli/XliHttpEventHandler.h → lib/Uno.Net.Http/cpp/XliHttpEventHandler.h b/.../Implementation/Xli/XliHttpEventHandler.h → lib/Uno.Net.Http/cpp/XliHttpEventHandler.h
diff --git a/...Implementation/Xli/XliHttpRequest.cpp.uxl → lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl b/...Implementation/Xli/XliHttpRequest.cpp.uxl → lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl
diff --git a/...ttp/Implementation/Xli/XliHttpRequest.uno → lib/Uno.Net.Http/cpp/XliHttpRequest.uno b/...ttp/Implementation/Xli/XliHttpRequest.uno → lib/Uno.Net.Http/cpp/XliHttpRequest.uno
diff --git a/...Net.Http/Implementation/iOS/HttpRequest.h → lib/Uno.Net.Http/ios/HttpRequest.h b/...Net.Http/Implementation/iOS/HttpRequest.h → lib/Uno.Net.Http/ios/HttpRequest.h
diff --git a/...et.Http/Implementation/iOS/HttpRequest.mm → lib/Uno.Net.Http/ios/HttpRequest.mm b/...et.Http/Implementation/iOS/HttpRequest.mm → lib/Uno.Net.Http/ios/HttpRequest.mm
diff --git a/...Implementation/iOS/iOSHttpRequest.cpp.uxl → lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl b/...Implementation/iOS/iOSHttpRequest.cpp.uxl → lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl
diff --git a/...ttp/Implementation/iOS/iOSHttpRequest.uno → lib/Uno.Net.Http/ios/iOSHttpRequest.uno b/...ttp/Implementation/iOS/iOSHttpRequest.uno → lib/Uno.Net.Http/ios/iOSHttpRequest.uno
diff --git a/...ementation/iOS/iOSHttpSharedCache.cpp.uxl → ...o.Net.Http/ios/iOSHttpSharedCache.cpp.uxl b/...ementation/iOS/iOSHttpSharedCache.cpp.uxl → ...o.Net.Http/ios/iOSHttpSharedCache.cpp.uxl
diff --git a/...Implementation/iOS/iOSHttpSharedCache.uno → lib/Uno.Net.Http/ios/iOSHttpSharedCache.uno b/...Implementation/iOS/iOSHttpSharedCache.uno → lib/Uno.Net.Http/ios/iOSHttpSharedCache.uno
diff --git a/...et.Http/Tests/Http.Test/Http.Test.unoproj → ...et.Http/tests/Http.Test/Http.Test.unoproj b/...et.Http/Tests/Http.Test/Http.Test.unoproj → ...et.Http/tests/Http.Test/Http.Test.unoproj
diff --git a/...Uno.Net.Http/Tests/Http.Test/UriTests.uno → ...Uno.Net.Http/tests/Http.Test/UriTests.uno b/...Uno.Net.Http/Tests/Http.Test/UriTests.uno → ...Uno.Net.Http/tests/Http.Test/UriTests.uno
diff --git a/...tusCodeTester/HttpStatusCodeTester.unosln → ...tusCodeTester/HttpStatusCodeTester.unosln b/...tusCodeTester/HttpStatusCodeTester.unosln → ...tusCodeTester/HttpStatusCodeTester.unosln
diff --git a/...usCodeTester/HttpStatusCodeTester/Cell.ux → ...usCodeTester/HttpStatusCodeTester/Cell.ux b/...usCodeTester/HttpStatusCodeTester/Cell.ux → ...usCodeTester/HttpStatusCodeTester/Cell.ux
diff --git a/...deTester/HttpStatusCodeTester/Cell.ux.uno → ...deTester/HttpStatusCodeTester/Cell.ux.uno b/...deTester/HttpStatusCodeTester/Cell.ux.uno → ...deTester/HttpStatusCodeTester/Cell.ux.uno
diff --git a/...er/HttpStatusCodeTester/HeadersTester.uno → ...er/HttpStatusCodeTester/HeadersTester.uno b/...er/HttpStatusCodeTester/HeadersTester.uno → ...er/HttpStatusCodeTester/HeadersTester.uno
diff --git a/...ester/HttpStatusCodeTester/HttpMessage.ux → ...ester/HttpStatusCodeTester/HttpMessage.ux b/...ester/HttpStatusCodeTester/HttpMessage.ux → ...ester/HttpStatusCodeTester/HttpMessage.ux
diff --git a/...r/HttpStatusCodeTester/HttpMessage.ux.uno → ...r/HttpStatusCodeTester/HttpMessage.ux.uno b/...r/HttpStatusCodeTester/HttpMessage.ux.uno → ...r/HttpStatusCodeTester/HttpMessage.ux.uno
diff --git a/...usCodeTester/HttpStatusCodeTester.unoproj → ...usCodeTester/HttpStatusCodeTester.unoproj b/...usCodeTester/HttpStatusCodeTester.unoproj → ...usCodeTester/HttpStatusCodeTester.unoproj
diff --git a/...ster/HttpStatusCodeTester/HttpWrapper.uno → ...ster/HttpStatusCodeTester/HttpWrapper.uno b/...ster/HttpStatusCodeTester/HttpWrapper.uno → ...ster/HttpStatusCodeTester/HttpWrapper.uno
diff --git a/...sCodeTester/HttpStatusCodeTester/MyApp.ux → ...sCodeTester/HttpStatusCodeTester/MyApp.ux b/...sCodeTester/HttpStatusCodeTester/MyApp.ux → ...sCodeTester/HttpStatusCodeTester/MyApp.ux
diff --git a/...HttpStatusCodeTester/StatusCodeTester.uno → ...HttpStatusCodeTester/StatusCodeTester.uno b/...HttpStatusCodeTester/StatusCodeTester.uno → ...HttpStatusCodeTester/StatusCodeTester.uno
diff --git a/...ttpStatusCodeTester/framework/DataGrid.ux → ...ttpStatusCodeTester/framework/DataGrid.ux b/...ttpStatusCodeTester/framework/DataGrid.ux → ...ttpStatusCodeTester/framework/DataGrid.ux
diff --git a/...tatusCodeTester/framework/DataGrid.ux.uno → ...tatusCodeTester/framework/DataGrid.ux.uno b/...tatusCodeTester/framework/DataGrid.ux.uno → ...tatusCodeTester/framework/DataGrid.ux.uno
diff --git a/...tpStatusCodeTester/framework/GridData.uno → ...tpStatusCodeTester/framework/GridData.uno b/...tpStatusCodeTester/framework/GridData.uno → ...tpStatusCodeTester/framework/GridData.uno
diff --git a/...pStatusCodeTester/framework/TabControl.ux → ...pStatusCodeTester/framework/TabControl.ux b/...pStatusCodeTester/framework/TabControl.ux → ...pStatusCodeTester/framework/TabControl.ux
diff --git a/...odeTester/framework/TabControl.ux.layouts → ...odeTester/framework/TabControl.ux.layouts b/...odeTester/framework/TabControl.ux.layouts → ...odeTester/framework/TabControl.ux.layouts
diff --git a/lib/Uno.Net.Sockets/Tests/Dns.Test.uno → lib/Uno.Net.Sockets/tests/Dns.Test.uno b/lib/Uno.Net.Sockets/Tests/Dns.Test.uno → lib/Uno.Net.Sockets/tests/Dns.Test.uno
diff --git a/lib/Uno.Net.Sockets/Tests/IPAddress.Test.uno → lib/Uno.Net.Sockets/tests/IPAddress.Test.uno b/lib/Uno.Net.Sockets/Tests/IPAddress.Test.uno → lib/Uno.Net.Sockets/tests/IPAddress.Test.uno
diff --git a/lib/Uno.Net.Sockets/Tests/Socket.Test.uno → lib/Uno.Net.Sockets/tests/Socket.Test.uno b/lib/Uno.Net.Sockets/Tests/Socket.Test.uno → lib/Uno.Net.Sockets/tests/Socket.Test.uno
diff --git a/...no.Net.Sockets/Tests/TcpListener.Test.uno → ...no.Net.Sockets/tests/TcpListener.Test.uno b/...no.Net.Sockets/Tests/TcpListener.Test.uno → ...no.Net.Sockets/tests/TcpListener.Test.uno
diff --git a/...ockets/Tests/Uno.Net.Sockets.Test.unoproj → ...ockets/tests/Uno.Net.Sockets.Test.unoproj b/...ockets/Tests/Uno.Net.Sockets.Test.unoproj → ...ockets/tests/Uno.Net.Sockets.Test.unoproj
diff --git a/lib/Uno.Testing/Uno.Testing.unoproj b/lib/Uno.Testing/Uno.Testing.unoproj
@@ -6,10 +6,10 @@
     "Uno.Testing.Test"
   ],
   "Includes": [
-    "Attributes/IgnoreAttribute.uno:Source",
-    "Attributes/TestAttribute.uno:Source",
-    "Exceptions/AssertionFailedException.uno:Source",
-    "Exceptions/IgnoreException.uno:Source",
+    "attributes/IgnoreAttribute.uno:Source",
+    "attributes/TestAttribute.uno:Source",
+    "exceptions/AssertionFailedException.uno:Source",
+    "exceptions/IgnoreException.uno:Source",
     "AbstractRunner.uno:Source",
     "Assert.uno:Source",
     "NamedTestMethod.uno:Source",

diff --git a/...no.Testing/Attributes/IgnoreAttribute.uno → ...no.Testing/attributes/IgnoreAttribute.uno b/...no.Testing/Attributes/IgnoreAttribute.uno → ...no.Testing/attributes/IgnoreAttribute.uno
diff --git a/lib/Uno.Testing/Attributes/TestAttribute.uno → lib/Uno.Testing/attributes/TestAttribute.uno b/lib/Uno.Testing/Attributes/TestAttribute.uno → lib/Uno.Testing/attributes/TestAttribute.uno
diff --git a/...g/Exceptions/AssertionFailedException.uno → ...g/exceptions/AssertionFailedException.uno b/...g/Exceptions/AssertionFailedException.uno → ...g/exceptions/AssertionFailedException.uno
diff --git a/...no.Testing/Exceptions/IgnoreException.uno → ...no.Testing/exceptions/IgnoreException.uno b/...no.Testing/Exceptions/IgnoreException.uno → ...no.Testing/exceptions/IgnoreException.uno
diff --git a/lib/Uno.Testing/Tests/App.uno → lib/Uno.Testing/tests/App.uno b/lib/Uno.Testing/Tests/App.uno → lib/Uno.Testing/tests/App.uno
diff --git a/...no.Testing/Tests/Uno.Testing.Test.unoproj → ...no.Testing/tests/Uno.Testing.Test.unoproj b/...no.Testing/Tests/Uno.Testing.Test.unoproj → ...no.Testing/tests/Uno.Testing.Test.unoproj
diff --git a/...g/Implementation/Posix/PthreadHelpers.uno → lib/Uno.Threading/PthreadHelpers.uno b/...g/Implementation/Posix/PthreadHelpers.uno → lib/Uno.Threading/PthreadHelpers.uno
@@ -11,14 +11,14 @@ namespace Uno.Threading
         {
         }
 
-        [Require("Source.Include", "Implementation/Posix/posix_mutex.h")]
+        [Require("Source.Include", "uThread/posix_mutex.h")]
         public static void CreateMutex(ref MutexHandle mutexHandle)
         @{
             if (!uPthreadCreateMutex(mutexHandle) != 0)
                 U_THROW(@{Uno.Exception(string):New(uString::Utf8("uPthreadCreateMutex failed!"))});
         @}
 
-        [Require("Source.Include", "Implementation/Posix/posix_mutex.h")]
+        [Require("Source.Include", "uThread/posix_mutex.h")]
         public static bool WaitOneMutex(ref MutexHandle mutexHandle, int millisecondsTimeout)
         @{
             return uPthreadWaitOneMutex(mutexHandle, millisecondsTimeout);
@@ -35,13 +35,13 @@ namespace Uno.Threading
         @}
 
         [TargetSpecificType]
-        [Set("Include", "Implementation/Posix/posix_semaphore.h")]
+        [Set("Include", "uThread/posix_semaphore.h")]
         [Set("TypeName", "uPosixSemaphore *")]
         public struct SemaphoreHandle
         {
         }
 
-        [Require("Source.Include", "Implementation/Posix/posix_semaphore.h")]
+        [Require("Source.Include", "uThread/posix_semaphore.h")]
         public static SemaphoreHandle CreateSemaphore(int initialCount, int maxCount)
         @{
             uPosixSemaphore* semaphoreHandle = uPosixCreateSemaphore(initialCount, maxCount);
@@ -52,13 +52,13 @@ namespace Uno.Threading
             return semaphoreHandle;
         @}
 
-        [Require("Source.Include", "Implementation/Posix/posix_semaphore.h")]
+        [Require("Source.Include", "uThread/posix_semaphore.h")]
         public static bool WaitOneSemaphore(SemaphoreHandle semaphoreHandle, int timeoutMillis)
         @{
             return uPosixWaitOneSemaphore(semaphoreHandle, timeoutMillis);
         @}
 
-        [Require("Source.Include", "Implementation/Posix/posix_semaphore.h")]
+        [Require("Source.Include", "uThread/posix_semaphore.h")]
         public static int ReleaseSemaphore(SemaphoreHandle semaphoreHandle, int releaseCount)
         @{
             int ret = uPosixReleaseSemaphore(semaphoreHandle, releaseCount);
@@ -73,7 +73,7 @@ namespace Uno.Threading
         @}
 
         [TargetSpecificType]
-        [Set("Include", "Implementation/Posix/posix_reset_event.h")]
+        [Set("Include", "uThread/posix_reset_event.h")]
         [Set("TypeName", "uPosixResetEvent *")]
         public struct ResetEventHandle
         {

diff --git a/lib/Uno.Threading/Uno.Threading.unoproj b/lib/Uno.Threading/Uno.Threading.unoproj
@@ -18,13 +18,13 @@
     "SyncDispatcher.uno:Source",
     "ThreadPool.uno:Source",
     "Tasks/Tasks.uno:Source",
-    "Implementation/Posix/posix_mutex.cpp:CSource:UNIX && !PInvoke",
-    "Implementation/Posix/posix_mutex.h:CHeader:UNIX && !PInvoke",
-    "Implementation/Posix/posix_reset_event.cpp:CSource:UNIX && !PInvoke",
-    "Implementation/Posix/posix_reset_event.h:CHeader:UNIX && !PInvoke",
-    "Implementation/Posix/posix_semaphore.cpp:CSource:UNIX && !PInvoke",
-    "Implementation/Posix/posix_semaphore.h:CHeader:UNIX && !PInvoke",
-    "Implementation/Posix/PthreadHelpers.uno:Source",
-    "Implementation/Win32/Win32Helpers.uno:Source",
+    "uThread/posix_mutex.cpp:CSource:UNIX && !PInvoke",
+    "uThread/posix_mutex.h:CHeader:UNIX && !PInvoke",
+    "uThread/posix_reset_event.cpp:CSource:UNIX && !PInvoke",
+    "uThread/posix_reset_event.h:CHeader:UNIX && !PInvoke",
+    "uThread/posix_semaphore.cpp:CSource:UNIX && !PInvoke",
+    "uThread/posix_semaphore.h:CHeader:UNIX && !PInvoke",
+    "PthreadHelpers.uno:Source",
+    "Win32Helpers.uno:Source",
   ]
 }
diff --git a/...ing/Implementation/Win32/Win32Helpers.uno → lib/Uno.Threading/Win32Helpers.uno b/...ing/Implementation/Win32/Win32Helpers.uno → lib/Uno.Threading/Win32Helpers.uno
diff --git a/...no.Threading/Tests/AutoResetEventTest.uno → ...no.Threading/tests/AutoResetEventTest.uno b/...no.Threading/Tests/AutoResetEventTest.uno → ...no.Threading/tests/AutoResetEventTest.uno
diff --git a/...ading/Tests/ConcurrentDictionary.Test.uno → ...ading/tests/ConcurrentDictionary.Test.uno b/...ading/Tests/ConcurrentDictionary.Test.uno → ...ading/tests/ConcurrentDictionary.Test.uno
diff --git a/lib/Uno.Threading/Tests/DummyException.uno → lib/Uno.Threading/tests/DummyException.uno b/lib/Uno.Threading/Tests/DummyException.uno → lib/Uno.Threading/tests/DummyException.uno
diff --git a/lib/Uno.Threading/Tests/DummyObject.uno → lib/Uno.Threading/tests/DummyObject.uno b/lib/Uno.Threading/Tests/DummyObject.uno → lib/Uno.Threading/tests/DummyObject.uno
diff --git a/lib/Uno.Threading/Tests/Helpers.uno → lib/Uno.Threading/tests/Helpers.uno b/lib/Uno.Threading/Tests/Helpers.uno → lib/Uno.Threading/tests/Helpers.uno
diff --git a/lib/Uno.Threading/Tests/MutexTests.uno → lib/Uno.Threading/tests/MutexTests.uno b/lib/Uno.Threading/Tests/MutexTests.uno → lib/Uno.Threading/tests/MutexTests.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_1_2.uno → ...no.Threading/tests/PromiseTests_2_1_2.uno b/...no.Threading/Tests/PromiseTests_2_1_2.uno → ...no.Threading/tests/PromiseTests_2_1_2.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_1_3.uno → ...no.Threading/tests/PromiseTests_2_1_3.uno b/...no.Threading/Tests/PromiseTests_2_1_3.uno → ...no.Threading/tests/PromiseTests_2_1_3.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_2_2.uno → ...no.Threading/tests/PromiseTests_2_2_2.uno b/...no.Threading/Tests/PromiseTests_2_2_2.uno → ...no.Threading/tests/PromiseTests_2_2_2.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_2_3.uno → ...no.Threading/tests/PromiseTests_2_2_3.uno b/...no.Threading/Tests/PromiseTests_2_2_3.uno → ...no.Threading/tests/PromiseTests_2_2_3.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_2_4.uno → ...no.Threading/tests/PromiseTests_2_2_4.uno b/...no.Threading/Tests/PromiseTests_2_2_4.uno → ...no.Threading/tests/PromiseTests_2_2_4.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_2_6.uno → ...no.Threading/tests/PromiseTests_2_2_6.uno b/...no.Threading/Tests/PromiseTests_2_2_6.uno → ...no.Threading/tests/PromiseTests_2_2_6.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_3_2.uno → ...no.Threading/tests/PromiseTests_2_3_2.uno b/...no.Threading/Tests/PromiseTests_2_3_2.uno → ...no.Threading/tests/PromiseTests_2_3_2.uno
diff --git a/...no.Threading/Tests/PromiseTests_2_3_4.uno → ...no.Threading/tests/PromiseTests_2_3_4.uno b/...no.Threading/Tests/PromiseTests_2_3_4.uno → ...no.Threading/tests/PromiseTests_2_3_4.uno
diff --git a/lib/Uno.Threading/Tests/SemaphoreTests.uno → lib/Uno.Threading/tests/SemaphoreTests.uno b/lib/Uno.Threading/Tests/SemaphoreTests.uno → lib/Uno.Threading/tests/SemaphoreTests.uno
diff --git a/...no.Threading/Tests/Threading.Test.unoproj → ...no.Threading/tests/Threading.Test.unoproj b/...no.Threading/Tests/Threading.Test.unoproj → ...no.Threading/tests/Threading.Test.unoproj
diff --git a/...ding/Implementation/Posix/posix_mutex.cpp → lib/Uno.Threading/uThread/posix_mutex.cpp b/...ding/Implementation/Posix/posix_mutex.cpp → lib/Uno.Threading/uThread/posix_mutex.cpp
@@ -1,4 +1,4 @@
-#include <Implementation/Posix/posix_mutex.h>
+#include <uThread/posix_mutex.h>
 #include <pthread.h>
 #include <errno.h>
 #include <uBase/Time.h>

diff --git a/...eading/Implementation/Posix/posix_mutex.h → lib/Uno.Threading/uThread/posix_mutex.h b/...eading/Implementation/Posix/posix_mutex.h → lib/Uno.Threading/uThread/posix_mutex.h
diff --git a/...mplementation/Posix/posix_reset_event.cpp → ...o.Threading/uThread/posix_reset_event.cpp b/...mplementation/Posix/posix_reset_event.cpp → ...o.Threading/uThread/posix_reset_event.cpp
@@ -1,4 +1,4 @@
-#include <Implementation/Posix/posix_reset_event.h>
+#include <uThread/posix_reset_event.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <stdint.h>

diff --git a/.../Implementation/Posix/posix_reset_event.h → ...Uno.Threading/uThread/posix_reset_event.h b/.../Implementation/Posix/posix_reset_event.h → ...Uno.Threading/uThread/posix_reset_event.h
diff --git a/.../Implementation/Posix/posix_semaphore.cpp → ...Uno.Threading/uThread/posix_semaphore.cpp b/.../Implementation/Posix/posix_semaphore.cpp → ...Uno.Threading/uThread/posix_semaphore.cpp
@@ -1,4 +1,4 @@
-#include <Implementation/Posix/posix_semaphore.h>
+#include <uThread/posix_semaphore.h>
 #include <errno.h>
 #include <time.h>
 #include <sys/time.h>

diff --git a/...ng/Implementation/Posix/posix_semaphore.h → lib/Uno.Threading/uThread/posix_semaphore.h b/...ng/Implementation/Posix/posix_semaphore.h → lib/Uno.Threading/uThread/posix_semaphore.h