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
deleted file mode 100644
index 1a8889c2e..000000000
--- a/lib/Uno.Collections/Tests/Uno.Collections.Test/Uno.Collections.Test.unoproj
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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/lib/Uno.Collections/Uno.Collections.unoproj b/lib/Uno.Collections/Uno.Collections.unoproj
index 365dd9f51..cea0ae713 100644
--- 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/lib/Uno.Collections/Extensions/EmptyEnumerable.uno b/lib/Uno.Collections/extensions/EmptyEnumerable.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/EmptyEnumerable.uno
rename to lib/Uno.Collections/extensions/EmptyEnumerable.uno
diff --git a/lib/Uno.Collections/Extensions/EnumerableExtensions.uno b/lib/Uno.Collections/extensions/EnumerableExtensions.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/EnumerableExtensions.uno
rename to lib/Uno.Collections/extensions/EnumerableExtensions.uno
diff --git a/lib/Uno.Collections/Extensions/IListExtensions.uno b/lib/Uno.Collections/extensions/IListExtensions.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/IListExtensions.uno
rename to lib/Uno.Collections/extensions/IListExtensions.uno
diff --git a/lib/Uno.Collections/Extensions/OfType.uno b/lib/Uno.Collections/extensions/OfType.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/OfType.uno
rename to lib/Uno.Collections/extensions/OfType.uno
diff --git a/lib/Uno.Collections/Extensions/OrderBy.uno b/lib/Uno.Collections/extensions/OrderBy.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/OrderBy.uno
rename to lib/Uno.Collections/extensions/OrderBy.uno
diff --git a/lib/Uno.Collections/Extensions/Select.uno b/lib/Uno.Collections/extensions/Select.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/Select.uno
rename to lib/Uno.Collections/extensions/Select.uno
diff --git a/lib/Uno.Collections/Extensions/Union.uno b/lib/Uno.Collections/extensions/Union.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/Union.uno
rename to lib/Uno.Collections/extensions/Union.uno
diff --git a/lib/Uno.Collections/Extensions/Where.uno b/lib/Uno.Collections/extensions/Where.uno
similarity index 100%
rename from lib/Uno.Collections/Extensions/Where.uno
rename to lib/Uno.Collections/extensions/Where.uno
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/ObservableList.Test.uno b/lib/Uno.Collections/tests/ObservableList.Test.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/ObservableList.Test.uno
rename to lib/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
new file mode 100644
index 000000000..7fd59cfa6
--- /dev/null
+++ 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/lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/DummyItem.uno b/lib/Uno.Collections/tests/extensions/DummyItem.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/DummyItem.uno
rename to lib/Uno.Collections/tests/extensions/DummyItem.uno
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/EmptyEnumerable.Test.uno b/lib/Uno.Collections/tests/extensions/EmptyEnumerable.Test.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/EmptyEnumerable.Test.uno
rename to lib/Uno.Collections/tests/extensions/EmptyEnumerable.Test.uno
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/EnumerableExtensions.Test.uno b/lib/Uno.Collections/tests/extensions/EnumerableExtensions.Test.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/EnumerableExtensions.Test.uno
rename to lib/Uno.Collections/tests/extensions/EnumerableExtensions.Test.uno
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/Helpers.uno b/lib/Uno.Collections/tests/extensions/Helpers.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/Helpers.uno
rename to lib/Uno.Collections/tests/extensions/Helpers.uno
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/IListExtensions.Test.uno b/lib/Uno.Collections/tests/extensions/IListExtensions.Test.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/IListExtensions.Test.uno
rename to lib/Uno.Collections/tests/extensions/IListExtensions.Test.uno
diff --git a/lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/OfType.Test.uno b/lib/Uno.Collections/tests/extensions/OfType.Test.uno
similarity index 100%
rename from lib/Uno.Collections/Tests/Uno.Collections.Test/Extensions/OfType.Test.uno
rename to lib/Uno.Collections/tests/extensions/OfType.Test.uno
diff --git a/lib/Uno.Data.Json/Source/JsonDataType.uno b/lib/Uno.Data.Json/JsonDataType.uno
similarity index 100%
rename from lib/Uno.Data.Json/Source/JsonDataType.uno
rename to lib/Uno.Data.Json/JsonDataType.uno
diff --git a/lib/Uno.Data.Json/Source/JsonException.uno b/lib/Uno.Data.Json/JsonException.uno
similarity index 100%
rename from lib/Uno.Data.Json/Source/JsonException.uno
rename to lib/Uno.Data.Json/JsonException.uno
diff --git a/lib/Uno.Data.Json/Source/JsonReader.uno b/lib/Uno.Data.Json/JsonReader.uno
similarity index 100%
rename from lib/Uno.Data.Json/Source/JsonReader.uno
rename to lib/Uno.Data.Json/JsonReader.uno
diff --git a/lib/Uno.Data.Json/Source/JsonValue.uno b/lib/Uno.Data.Json/JsonValue.uno
similarity index 100%
rename from lib/Uno.Data.Json/Source/JsonValue.uno
rename to lib/Uno.Data.Json/JsonValue.uno
diff --git a/lib/Uno.Data.Json/Source/JsonWriter.uno b/lib/Uno.Data.Json/JsonWriter.uno
similarity index 100%
rename from lib/Uno.Data.Json/Source/JsonWriter.uno
rename to lib/Uno.Data.Json/JsonWriter.uno
diff --git a/lib/Uno.Data.Json/Source/Parser.uno b/lib/Uno.Data.Json/Parser.uno
similarity index 100%
rename from lib/Uno.Data.Json/Source/Parser.uno
rename to 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
index ec1a06775..72146a972 100644
--- 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/lib/Uno.Data.Json/Tests/JsonTests/JsonTests.uno b/lib/Uno.Data.Json/tests/JsonTests.uno
similarity index 100%
rename from lib/Uno.Data.Json/Tests/JsonTests/JsonTests.uno
rename to lib/Uno.Data.Json/tests/JsonTests.uno
diff --git a/lib/Uno.Data.Json/Tests/JsonTests/TestData/test1.json b/lib/Uno.Data.Json/tests/TestData/test1.json
similarity index 100%
rename from lib/Uno.Data.Json/Tests/JsonTests/TestData/test1.json
rename to lib/Uno.Data.Json/tests/TestData/test1.json
diff --git a/lib/Uno.Data.Json/Tests/JsonTests/TestData/test2.json b/lib/Uno.Data.Json/tests/TestData/test2.json
similarity index 100%
rename from lib/Uno.Data.Json/Tests/JsonTests/TestData/test2.json
rename to lib/Uno.Data.Json/tests/TestData/test2.json
diff --git a/lib/Uno.Data.Json/Tests/JsonTests/TestData/test3.json b/lib/Uno.Data.Json/tests/TestData/test3.json
similarity index 100%
rename from lib/Uno.Data.Json/Tests/JsonTests/TestData/test3.json
rename to lib/Uno.Data.Json/tests/TestData/test3.json
diff --git a/lib/Uno.Data.Json/Tests/JsonTests/TestData/test4.json b/lib/Uno.Data.Json/tests/TestData/test4.json
similarity index 100%
rename from lib/Uno.Data.Json/Tests/JsonTests/TestData/test4.json
rename to lib/Uno.Data.Json/tests/TestData/test4.json
diff --git a/lib/Uno.Data.Json/Tests/JsonTests/Uno.Data.Json.Test.unoproj b/lib/Uno.Data.Json/tests/Uno.Data.Json.Test.unoproj
similarity index 91%
rename from lib/Uno.Data.Json/Tests/JsonTests/Uno.Data.Json.Test.unoproj
rename to lib/Uno.Data.Json/tests/Uno.Data.Json.Test.unoproj
index ca00cbf48..1d0502730 100644
--- a/lib/Uno.Data.Json/Tests/JsonTests/Uno.Data.Json.Test.unoproj
+++ b/lib/Uno.Data.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
deleted file mode 100644
index 6048e3df1..000000000
--- a/lib/Uno.Data.Xml/Tests/Xml.Test.unosln
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/lib/Uno.Data.Xml/Uno.Data.Xml.unoproj b/lib/Uno.Data.Xml/Uno.Data.Xml.unoproj
index 1738b1df9..29a33a778 100644
--- 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/lib/Uno.Data.Xml/Source/XmlAttributeHandle.uno b/lib/Uno.Data.Xml/XmlAttributeHandle.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/XmlAttributeHandle.uno
rename to lib/Uno.Data.Xml/XmlAttributeHandle.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlEnums.uno b/lib/Uno.Data.Xml/XmlEnums.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/XmlEnums.uno
rename to lib/Uno.Data.Xml/XmlEnums.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlException.uno b/lib/Uno.Data.Xml/XmlException.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/XmlException.uno
rename to lib/Uno.Data.Xml/XmlException.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlNodeHandle.uno b/lib/Uno.Data.Xml/XmlNodeHandle.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/XmlNodeHandle.uno
rename to lib/Uno.Data.Xml/XmlNodeHandle.uno
diff --git a/lib/Uno.Data.Xml/Source/XmlNodeImpl.uno b/lib/Uno.Data.Xml/XmlNodeImpl.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/XmlNodeImpl.uno
rename to lib/Uno.Data.Xml/XmlNodeImpl.uno
diff --git a/lib/Uno.Data.Xml/Source/System.Xml.uno b/lib/Uno.Data.Xml/cil/System.Xml.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/System.Xml.uno
rename to lib/Uno.Data.Xml/cil/System.Xml.uno
diff --git a/lib/Uno.Data.Xml/Targets/CIL/Uno.Data.Xml.cil.uxl b/lib/Uno.Data.Xml/cil/System.Xml.uxl
similarity index 100%
rename from lib/Uno.Data.Xml/Targets/CIL/Uno.Data.Xml.cil.uxl
rename to lib/Uno.Data.Xml/cil/System.Xml.uxl
diff --git a/lib/Uno.Data.Xml/Source/Collections/XmlAttributeCollection.uno b/lib/Uno.Data.Xml/collections/XmlAttributeCollection.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Collections/XmlAttributeCollection.uno
rename to lib/Uno.Data.Xml/collections/XmlAttributeCollection.uno
diff --git a/lib/Uno.Data.Xml/Source/Collections/XmlLinkedNodeCollection.uno b/lib/Uno.Data.Xml/collections/XmlLinkedNodeCollection.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Collections/XmlLinkedNodeCollection.uno
rename to lib/Uno.Data.Xml/collections/XmlLinkedNodeCollection.uno
diff --git a/lib/Uno.Data.Xml/Source/Collections/XmlNodeCollectionBase.uno b/lib/Uno.Data.Xml/collections/XmlNodeCollectionBase.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Collections/XmlNodeCollectionBase.uno
rename to lib/Uno.Data.Xml/collections/XmlNodeCollectionBase.uno
diff --git a/lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugiconfig.hpp b/lib/Uno.Data.Xml/cpp/pugiconfig.hpp
similarity index 100%
rename from lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugiconfig.hpp
rename to lib/Uno.Data.Xml/cpp/pugiconfig.hpp
diff --git a/lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugixml.cpp b/lib/Uno.Data.Xml/cpp/pugixml.cpp
similarity index 99%
rename from lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugixml.cpp
rename to lib/Uno.Data.Xml/cpp/pugixml.cpp
index 1829ca80d..7790961e3 100644
--- a/lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugixml.cpp
+++ b/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
#include
diff --git a/lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugixml.hpp b/lib/Uno.Data.Xml/cpp/pugixml.hpp
similarity index 100%
rename from lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugixml.hpp
rename to lib/Uno.Data.Xml/cpp/pugixml.hpp
diff --git a/lib/Uno.Data.Xml/Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl b/lib/Uno.Data.Xml/cpp/pugixml.uxl
similarity index 95%
rename from lib/Uno.Data.Xml/Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl
rename to lib/Uno.Data.Xml/cpp/pugixml.uxl
index 0fd819249..e2144e004 100644
--- a/lib/Uno.Data.Xml/Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl
+++ b/lib/Uno.Data.Xml/cpp/pugixml.uxl
@@ -4,11 +4,11 @@
-
-
-
+
+
+
-
+
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlAttribute.uno b/lib/Uno.Data.Xml/elements/XmlAttribute.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlAttribute.uno
rename to lib/Uno.Data.Xml/elements/XmlAttribute.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlCharacterData.uno b/lib/Uno.Data.Xml/elements/XmlCharacterData.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlCharacterData.uno
rename to lib/Uno.Data.Xml/elements/XmlCharacterData.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlComment.uno b/lib/Uno.Data.Xml/elements/XmlComment.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlComment.uno
rename to lib/Uno.Data.Xml/elements/XmlComment.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlDeclaration.uno b/lib/Uno.Data.Xml/elements/XmlDeclaration.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlDeclaration.uno
rename to lib/Uno.Data.Xml/elements/XmlDeclaration.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlDocument.uno b/lib/Uno.Data.Xml/elements/XmlDocument.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlDocument.uno
rename to lib/Uno.Data.Xml/elements/XmlDocument.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlDocumentElement.uno b/lib/Uno.Data.Xml/elements/XmlDocumentElement.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlDocumentElement.uno
rename to lib/Uno.Data.Xml/elements/XmlDocumentElement.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlElement.uno b/lib/Uno.Data.Xml/elements/XmlElement.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlElement.uno
rename to lib/Uno.Data.Xml/elements/XmlElement.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlLinkedNode.uno b/lib/Uno.Data.Xml/elements/XmlLinkedNode.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlLinkedNode.uno
rename to lib/Uno.Data.Xml/elements/XmlLinkedNode.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlNode.uno b/lib/Uno.Data.Xml/elements/XmlNode.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlNode.uno
rename to lib/Uno.Data.Xml/elements/XmlNode.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlProcessingInstruction.uno b/lib/Uno.Data.Xml/elements/XmlProcessingInstruction.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlProcessingInstruction.uno
rename to lib/Uno.Data.Xml/elements/XmlProcessingInstruction.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlText.uno b/lib/Uno.Data.Xml/elements/XmlText.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlText.uno
rename to lib/Uno.Data.Xml/elements/XmlText.uno
diff --git a/lib/Uno.Data.Xml/Source/Elements/XmlValue.uno b/lib/Uno.Data.Xml/elements/XmlValue.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Elements/XmlValue.uno
rename to lib/Uno.Data.Xml/elements/XmlValue.uno
diff --git a/lib/Uno.Data.Xml/Source/Helpers/AttributeHandleConverter.uno b/lib/Uno.Data.Xml/helpers/AttributeHandleConverter.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Helpers/AttributeHandleConverter.uno
rename to lib/Uno.Data.Xml/helpers/AttributeHandleConverter.uno
diff --git a/lib/Uno.Data.Xml/Source/Helpers/ValidationHelper.uno b/lib/Uno.Data.Xml/helpers/ValidationHelper.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Helpers/ValidationHelper.uno
rename to lib/Uno.Data.Xml/helpers/ValidationHelper.uno
diff --git a/lib/Uno.Data.Xml/Source/Helpers/XmlEncodingHelper.uno b/lib/Uno.Data.Xml/helpers/XmlEncodingHelper.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Helpers/XmlEncodingHelper.uno
rename to lib/Uno.Data.Xml/helpers/XmlEncodingHelper.uno
diff --git a/lib/Uno.Data.Xml/Source/Helpers/XmlNodeHandleConverter.uno b/lib/Uno.Data.Xml/helpers/XmlNodeHandleConverter.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Source/Helpers/XmlNodeHandleConverter.uno
rename to lib/Uno.Data.Xml/helpers/XmlNodeHandleConverter.uno
diff --git a/lib/Uno.Data.Xml/Tests/Xml.Test/Xml.Test.unoproj b/lib/Uno.Data.Xml/tests/Xml.Test.unoproj
similarity index 100%
rename from lib/Uno.Data.Xml/Tests/Xml.Test/Xml.Test.unoproj
rename to lib/Uno.Data.Xml/tests/Xml.Test.unoproj
diff --git a/lib/Uno.Data.Xml/Tests/Xml.Test/XmlDocumentTests.uno b/lib/Uno.Data.Xml/tests/XmlDocumentTests.uno
similarity index 100%
rename from lib/Uno.Data.Xml/Tests/Xml.Test/XmlDocumentTests.uno
rename to 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
index 134d5dc5a..83e726bbe 100644
--- 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 b/lib/Uno.Graphics.Utils/cpp/CppFontFace.uno
similarity index 100%
rename from lib/Uno.Graphics.Utils/Cpp/CppFontFace.uno
rename to lib/Uno.Graphics.Utils/cpp/CppFontFace.uno
diff --git a/lib/Uno.Graphics.Utils/Cpp/CppTexture.uno b/lib/Uno.Graphics.Utils/cpp/CppTexture.uno
similarity index 100%
rename from lib/Uno.Graphics.Utils/Cpp/CppTexture.uno
rename to lib/Uno.Graphics.Utils/cpp/CppTexture.uno
diff --git a/lib/Uno.Graphics.Utils/DotNet/.gitignore b/lib/Uno.Graphics.Utils/dotnet/.gitignore
similarity index 100%
rename from lib/Uno.Graphics.Utils/DotNet/.gitignore
rename to lib/Uno.Graphics.Utils/dotnet/.gitignore
diff --git a/lib/Uno.Graphics.Utils/DotNet/DotNetFontFace.uno b/lib/Uno.Graphics.Utils/dotnet/DotNetFontFace.uno
similarity index 100%
rename from lib/Uno.Graphics.Utils/DotNet/DotNetFontFace.uno
rename to lib/Uno.Graphics.Utils/dotnet/DotNetFontFace.uno
diff --git a/lib/Uno.Graphics.Utils/DotNet/DotNetTexture.uno b/lib/Uno.Graphics.Utils/dotnet/DotNetTexture.uno
similarity index 100%
rename from lib/Uno.Graphics.Utils/DotNet/DotNetTexture.uno
rename to lib/Uno.Graphics.Utils/dotnet/DotNetTexture.uno
diff --git a/lib/Uno.Graphics.Utils/DotNet/Uno.Native.stuff b/lib/Uno.Graphics.Utils/dotnet/Uno.Native.stuff
similarity index 100%
rename from lib/Uno.Graphics.Utils/DotNet/Uno.Native.stuff
rename to lib/Uno.Graphics.Utils/dotnet/Uno.Native.stuff
diff --git a/lib/Uno.Graphics.Utils/DotNet/Uno.Native.uno b/lib/Uno.Graphics.Utils/dotnet/Uno.Native.uno
similarity index 100%
rename from lib/Uno.Graphics.Utils/DotNet/Uno.Native.uno
rename to lib/Uno.Graphics.Utils/dotnet/Uno.Native.uno
diff --git a/lib/Uno.Graphics.Utils/DotNet/Uno.Native.uxl b/lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl
similarity index 100%
rename from lib/Uno.Graphics.Utils/DotNet/Uno.Native.uxl
rename to lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl
diff --git a/lib/Uno.Net.Http/Implementation/IHttpRequest.uno b/lib/Uno.Net.Http/IHttpRequest.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/IHttpRequest.uno
rename to 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
index 96d281783..42b81438b 100644
--- 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/lib/Uno.Net.Http/Implementation/Android/AndroidHttpRequest.uno b/lib/Uno.Net.Http/android/AndroidHttpRequest.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/AndroidHttpRequest.uno
rename to lib/Uno.Net.Http/android/AndroidHttpRequest.uno
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java b/lib/Uno.Net.Http/android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java
rename to lib/Uno.Net.Http/android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/DownloadTask.java b/lib/Uno.Net.Http/android/ExperimentalHttp/DownloadTask.java
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/DownloadTask.java
rename to lib/Uno.Net.Http/android/ExperimentalHttp/DownloadTask.java
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/HttpRequest.cpp.uxl b/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.cpp.uxl
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/HttpRequest.cpp.uxl
rename to lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.cpp.uxl
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/HttpRequest.java b/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.java
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/HttpRequest.java
rename to lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.java
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/HttpRequest.uno b/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/HttpRequest.uno
rename to lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.uno
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/PRNGFixes.java b/lib/Uno.Net.Http/android/ExperimentalHttp/PRNGFixes.java
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/PRNGFixes.java
rename to lib/Uno.Net.Http/android/ExperimentalHttp/PRNGFixes.java
diff --git a/lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/UploadTask.java b/lib/Uno.Net.Http/android/ExperimentalHttp/UploadTask.java
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Android/ExperimentalHttp/UploadTask.java
rename to lib/Uno.Net.Http/android/ExperimentalHttp/UploadTask.java
diff --git a/lib/Uno.Net.Http/Implementation/Cil/CilHttpRequest.cil.uxl b/lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/CilHttpRequest.cil.uxl
rename to lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl
diff --git a/lib/Uno.Net.Http/Implementation/Cil/CilHttpRequest.uno b/lib/Uno.Net.Http/cil/CilHttpRequest.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/CilHttpRequest.uno
rename to lib/Uno.Net.Http/cil/CilHttpRequest.uno
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/App.config b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/App.config
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/App.config
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/App.config
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/Program.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/Program.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/Program.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/Program.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/Properties/AssemblyInfo.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/Properties/AssemblyInfo.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/Properties/AssemblyInfo.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/Uno.Net.Http.Implementation.Test.csproj b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/Uno.Net.Http.Implementation.Test.csproj
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.Test/Uno.Net.Http.Implementation.Test.csproj
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.Test/Uno.Net.Http.Implementation.Test.csproj
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.dll b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.dll
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.dll
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.dll
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.sln b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.sln
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation.sln
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation.sln
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/HttpClientImpl.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/HttpClientImpl.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/HttpClientImpl.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/HttpClientImpl.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/HttpHelper.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/HttpHelper.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/HttpHelper.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/HttpHelper.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/HttpRequest.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/HttpRequest.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/HttpRequest.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/HttpRequest.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/HttpResponse.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/HttpResponse.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/HttpResponse.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/HttpResponse.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/StreamExtensions.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/StreamExtensions.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/StreamExtensions.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/StreamExtensions.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/TaskAsyncHelper.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/TaskAsyncHelper.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/MyHttpLib/TaskAsyncHelper.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/MyHttpLib/TaskAsyncHelper.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/Properties/AssemblyInfo.cs b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/Properties/AssemblyInfo.cs
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/Properties/AssemblyInfo.cs
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/Properties/AssemblyInfo.cs
diff --git a/lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/Uno.Net.Http.Implementation.csproj b/lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/Uno.Net.Http.Implementation.csproj
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Cil/Uno.Net.Http.Implementation/Uno.Net.Http.Implementation.csproj
rename to lib/Uno.Net.Http/cil/Uno.Net.Http.Implementation/Uno.Net.Http.Implementation.csproj
diff --git a/lib/Uno.Net.Http/Implementation/Xli/XliHttpEventHandler.h b/lib/Uno.Net.Http/cpp/XliHttpEventHandler.h
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Xli/XliHttpEventHandler.h
rename to lib/Uno.Net.Http/cpp/XliHttpEventHandler.h
diff --git a/lib/Uno.Net.Http/Implementation/Xli/XliHttpRequest.cpp.uxl b/lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Xli/XliHttpRequest.cpp.uxl
rename to lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl
diff --git a/lib/Uno.Net.Http/Implementation/Xli/XliHttpRequest.uno b/lib/Uno.Net.Http/cpp/XliHttpRequest.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/Xli/XliHttpRequest.uno
rename to lib/Uno.Net.Http/cpp/XliHttpRequest.uno
diff --git a/lib/Uno.Net.Http/Implementation/iOS/HttpRequest.h b/lib/Uno.Net.Http/ios/HttpRequest.h
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/iOS/HttpRequest.h
rename to lib/Uno.Net.Http/ios/HttpRequest.h
diff --git a/lib/Uno.Net.Http/Implementation/iOS/HttpRequest.mm b/lib/Uno.Net.Http/ios/HttpRequest.mm
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/iOS/HttpRequest.mm
rename to lib/Uno.Net.Http/ios/HttpRequest.mm
diff --git a/lib/Uno.Net.Http/Implementation/iOS/iOSHttpRequest.cpp.uxl b/lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/iOS/iOSHttpRequest.cpp.uxl
rename to lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl
diff --git a/lib/Uno.Net.Http/Implementation/iOS/iOSHttpRequest.uno b/lib/Uno.Net.Http/ios/iOSHttpRequest.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/iOS/iOSHttpRequest.uno
rename to lib/Uno.Net.Http/ios/iOSHttpRequest.uno
diff --git a/lib/Uno.Net.Http/Implementation/iOS/iOSHttpSharedCache.cpp.uxl b/lib/Uno.Net.Http/ios/iOSHttpSharedCache.cpp.uxl
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/iOS/iOSHttpSharedCache.cpp.uxl
rename to lib/Uno.Net.Http/ios/iOSHttpSharedCache.cpp.uxl
diff --git a/lib/Uno.Net.Http/Implementation/iOS/iOSHttpSharedCache.uno b/lib/Uno.Net.Http/ios/iOSHttpSharedCache.uno
similarity index 100%
rename from lib/Uno.Net.Http/Implementation/iOS/iOSHttpSharedCache.uno
rename to lib/Uno.Net.Http/ios/iOSHttpSharedCache.uno
diff --git a/lib/Uno.Net.Http/Tests/Http.Test/Http.Test.unoproj b/lib/Uno.Net.Http/tests/Http.Test/Http.Test.unoproj
similarity index 100%
rename from lib/Uno.Net.Http/Tests/Http.Test/Http.Test.unoproj
rename to lib/Uno.Net.Http/tests/Http.Test/Http.Test.unoproj
diff --git a/lib/Uno.Net.Http/Tests/Http.Test/UriTests.uno b/lib/Uno.Net.Http/tests/Http.Test/UriTests.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/Http.Test/UriTests.uno
rename to lib/Uno.Net.Http/tests/Http.Test/UriTests.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester.unosln b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester.unosln
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester.unosln
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester.unosln
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/Cell.ux.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HeadersTester.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HeadersTester.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HeadersTester.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HeadersTester.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpMessage.ux.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpStatusCodeTester.unoproj b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpStatusCodeTester.unoproj
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpStatusCodeTester.unoproj
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpStatusCodeTester.unoproj
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpWrapper.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpWrapper.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpWrapper.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/HttpWrapper.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/MyApp.ux b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/MyApp.ux
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/MyApp.ux
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/MyApp.ux
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/StatusCodeTester.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/StatusCodeTester.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/StatusCodeTester.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/StatusCodeTester.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/DataGrid.ux.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/GridData.uno b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/GridData.uno
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/GridData.uno
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/GridData.uno
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux
diff --git a/lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux.layouts b/lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux.layouts
similarity index 100%
rename from lib/Uno.Net.Http/Tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux.layouts
rename to lib/Uno.Net.Http/tests/HttpStatusCodeTester/HttpStatusCodeTester/framework/TabControl.ux.layouts
diff --git a/lib/Uno.Net.Sockets/Tests/Dns.Test.uno b/lib/Uno.Net.Sockets/tests/Dns.Test.uno
similarity index 100%
rename from lib/Uno.Net.Sockets/Tests/Dns.Test.uno
rename to lib/Uno.Net.Sockets/tests/Dns.Test.uno
diff --git a/lib/Uno.Net.Sockets/Tests/IPAddress.Test.uno b/lib/Uno.Net.Sockets/tests/IPAddress.Test.uno
similarity index 100%
rename from lib/Uno.Net.Sockets/Tests/IPAddress.Test.uno
rename to lib/Uno.Net.Sockets/tests/IPAddress.Test.uno
diff --git a/lib/Uno.Net.Sockets/Tests/Socket.Test.uno b/lib/Uno.Net.Sockets/tests/Socket.Test.uno
similarity index 100%
rename from lib/Uno.Net.Sockets/Tests/Socket.Test.uno
rename to lib/Uno.Net.Sockets/tests/Socket.Test.uno
diff --git a/lib/Uno.Net.Sockets/Tests/TcpListener.Test.uno b/lib/Uno.Net.Sockets/tests/TcpListener.Test.uno
similarity index 100%
rename from lib/Uno.Net.Sockets/Tests/TcpListener.Test.uno
rename to lib/Uno.Net.Sockets/tests/TcpListener.Test.uno
diff --git a/lib/Uno.Net.Sockets/Tests/Uno.Net.Sockets.Test.unoproj b/lib/Uno.Net.Sockets/tests/Uno.Net.Sockets.Test.unoproj
similarity index 100%
rename from lib/Uno.Net.Sockets/Tests/Uno.Net.Sockets.Test.unoproj
rename to lib/Uno.Net.Sockets/tests/Uno.Net.Sockets.Test.unoproj
diff --git a/lib/Uno.Testing/Uno.Testing.unoproj b/lib/Uno.Testing/Uno.Testing.unoproj
index bd6dd542e..f563e40bc 100644
--- 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/lib/Uno.Testing/Attributes/IgnoreAttribute.uno b/lib/Uno.Testing/attributes/IgnoreAttribute.uno
similarity index 100%
rename from lib/Uno.Testing/Attributes/IgnoreAttribute.uno
rename to lib/Uno.Testing/attributes/IgnoreAttribute.uno
diff --git a/lib/Uno.Testing/Attributes/TestAttribute.uno b/lib/Uno.Testing/attributes/TestAttribute.uno
similarity index 100%
rename from lib/Uno.Testing/Attributes/TestAttribute.uno
rename to lib/Uno.Testing/attributes/TestAttribute.uno
diff --git a/lib/Uno.Testing/Exceptions/AssertionFailedException.uno b/lib/Uno.Testing/exceptions/AssertionFailedException.uno
similarity index 100%
rename from lib/Uno.Testing/Exceptions/AssertionFailedException.uno
rename to lib/Uno.Testing/exceptions/AssertionFailedException.uno
diff --git a/lib/Uno.Testing/Exceptions/IgnoreException.uno b/lib/Uno.Testing/exceptions/IgnoreException.uno
similarity index 100%
rename from lib/Uno.Testing/Exceptions/IgnoreException.uno
rename to lib/Uno.Testing/exceptions/IgnoreException.uno
diff --git a/lib/Uno.Testing/Tests/App.uno b/lib/Uno.Testing/tests/App.uno
similarity index 100%
rename from lib/Uno.Testing/Tests/App.uno
rename to lib/Uno.Testing/tests/App.uno
diff --git a/lib/Uno.Testing/Tests/Uno.Testing.Test.unoproj b/lib/Uno.Testing/tests/Uno.Testing.Test.unoproj
similarity index 100%
rename from lib/Uno.Testing/Tests/Uno.Testing.Test.unoproj
rename to lib/Uno.Testing/tests/Uno.Testing.Test.unoproj
diff --git a/lib/Uno.Threading/Implementation/Posix/PthreadHelpers.uno b/lib/Uno.Threading/PthreadHelpers.uno
similarity index 86%
rename from lib/Uno.Threading/Implementation/Posix/PthreadHelpers.uno
rename to lib/Uno.Threading/PthreadHelpers.uno
index ca44dcad4..999851ba7 100644
--- a/lib/Uno.Threading/Implementation/Posix/PthreadHelpers.uno
+++ b/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
index 2ffa30c43..971b57db6 100644
--- 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/lib/Uno.Threading/Implementation/Win32/Win32Helpers.uno b/lib/Uno.Threading/Win32Helpers.uno
similarity index 100%
rename from lib/Uno.Threading/Implementation/Win32/Win32Helpers.uno
rename to lib/Uno.Threading/Win32Helpers.uno
diff --git a/lib/Uno.Threading/Tests/AutoResetEventTest.uno b/lib/Uno.Threading/tests/AutoResetEventTest.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/AutoResetEventTest.uno
rename to lib/Uno.Threading/tests/AutoResetEventTest.uno
diff --git a/lib/Uno.Threading/Tests/ConcurrentDictionary.Test.uno b/lib/Uno.Threading/tests/ConcurrentDictionary.Test.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/ConcurrentDictionary.Test.uno
rename to lib/Uno.Threading/tests/ConcurrentDictionary.Test.uno
diff --git a/lib/Uno.Threading/Tests/DummyException.uno b/lib/Uno.Threading/tests/DummyException.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/DummyException.uno
rename to lib/Uno.Threading/tests/DummyException.uno
diff --git a/lib/Uno.Threading/Tests/DummyObject.uno b/lib/Uno.Threading/tests/DummyObject.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/DummyObject.uno
rename to lib/Uno.Threading/tests/DummyObject.uno
diff --git a/lib/Uno.Threading/Tests/Helpers.uno b/lib/Uno.Threading/tests/Helpers.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/Helpers.uno
rename to lib/Uno.Threading/tests/Helpers.uno
diff --git a/lib/Uno.Threading/Tests/MutexTests.uno b/lib/Uno.Threading/tests/MutexTests.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/MutexTests.uno
rename to lib/Uno.Threading/tests/MutexTests.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_1_2.uno b/lib/Uno.Threading/tests/PromiseTests_2_1_2.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_1_2.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_1_2.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_1_3.uno b/lib/Uno.Threading/tests/PromiseTests_2_1_3.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_1_3.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_1_3.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_2_2.uno b/lib/Uno.Threading/tests/PromiseTests_2_2_2.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_2_2.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_2_2.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_2_3.uno b/lib/Uno.Threading/tests/PromiseTests_2_2_3.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_2_3.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_2_3.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_2_4.uno b/lib/Uno.Threading/tests/PromiseTests_2_2_4.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_2_4.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_2_4.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_2_6.uno b/lib/Uno.Threading/tests/PromiseTests_2_2_6.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_2_6.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_2_6.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_3_2.uno b/lib/Uno.Threading/tests/PromiseTests_2_3_2.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_3_2.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_3_2.uno
diff --git a/lib/Uno.Threading/Tests/PromiseTests_2_3_4.uno b/lib/Uno.Threading/tests/PromiseTests_2_3_4.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/PromiseTests_2_3_4.uno
rename to lib/Uno.Threading/tests/PromiseTests_2_3_4.uno
diff --git a/lib/Uno.Threading/Tests/SemaphoreTests.uno b/lib/Uno.Threading/tests/SemaphoreTests.uno
similarity index 100%
rename from lib/Uno.Threading/Tests/SemaphoreTests.uno
rename to lib/Uno.Threading/tests/SemaphoreTests.uno
diff --git a/lib/Uno.Threading/Tests/Threading.Test.unoproj b/lib/Uno.Threading/tests/Threading.Test.unoproj
similarity index 100%
rename from lib/Uno.Threading/Tests/Threading.Test.unoproj
rename to lib/Uno.Threading/tests/Threading.Test.unoproj
diff --git a/lib/Uno.Threading/Implementation/Posix/posix_mutex.cpp b/lib/Uno.Threading/uThread/posix_mutex.cpp
similarity index 95%
rename from lib/Uno.Threading/Implementation/Posix/posix_mutex.cpp
rename to lib/Uno.Threading/uThread/posix_mutex.cpp
index c92a04377..cd29f6201 100644
--- a/lib/Uno.Threading/Implementation/Posix/posix_mutex.cpp
+++ b/lib/Uno.Threading/uThread/posix_mutex.cpp
@@ -1,4 +1,4 @@
-#include
+#include
#include
#include
#include
diff --git a/lib/Uno.Threading/Implementation/Posix/posix_mutex.h b/lib/Uno.Threading/uThread/posix_mutex.h
similarity index 100%
rename from lib/Uno.Threading/Implementation/Posix/posix_mutex.h
rename to lib/Uno.Threading/uThread/posix_mutex.h
diff --git a/lib/Uno.Threading/Implementation/Posix/posix_reset_event.cpp b/lib/Uno.Threading/uThread/posix_reset_event.cpp
similarity index 97%
rename from lib/Uno.Threading/Implementation/Posix/posix_reset_event.cpp
rename to lib/Uno.Threading/uThread/posix_reset_event.cpp
index 7a0336581..e103058ef 100644
--- a/lib/Uno.Threading/Implementation/Posix/posix_reset_event.cpp
+++ b/lib/Uno.Threading/uThread/posix_reset_event.cpp
@@ -1,4 +1,4 @@
-#include
+#include
#include
#include
#include
diff --git a/lib/Uno.Threading/Implementation/Posix/posix_reset_event.h b/lib/Uno.Threading/uThread/posix_reset_event.h
similarity index 100%
rename from lib/Uno.Threading/Implementation/Posix/posix_reset_event.h
rename to lib/Uno.Threading/uThread/posix_reset_event.h
diff --git a/lib/Uno.Threading/Implementation/Posix/posix_semaphore.cpp b/lib/Uno.Threading/uThread/posix_semaphore.cpp
similarity index 97%
rename from lib/Uno.Threading/Implementation/Posix/posix_semaphore.cpp
rename to lib/Uno.Threading/uThread/posix_semaphore.cpp
index dc2ce6ee8..06ca01b71 100644
--- a/lib/Uno.Threading/Implementation/Posix/posix_semaphore.cpp
+++ b/lib/Uno.Threading/uThread/posix_semaphore.cpp
@@ -1,4 +1,4 @@
-#include
+#include
#include
#include
#include
diff --git a/lib/Uno.Threading/Implementation/Posix/posix_semaphore.h b/lib/Uno.Threading/uThread/posix_semaphore.h
similarity index 100%
rename from lib/Uno.Threading/Implementation/Posix/posix_semaphore.h
rename to lib/Uno.Threading/uThread/posix_semaphore.h