Rename header files to match the namespace structure for things nested within Azure::Core. (#1879)

* Rename header files to match the namespace structure for things nested
within Azure::Core.

* Update a header include that was missed.

sdk/core/azure-core/CHANGELOG.md

@@ -49,6 +49,11 @@
 - Moved `AccessToken`, `TokenCredential`, and `AuthenticationException` from `Azure::Core` to `Azure::Core::Credentials` namespace.
 - Moved the Http policies from `Azure::Core::Http` to `Azure::Core::Http::Policies`.
 - Moved `Azure::Core::Http::Url` to `Azure::Core::Url`.
+- Renamed `azure/core/credentials.hpp` to `azure/core/credentials/credentials.hpp`
+- Renamed `azure/core/logger.hpp` to `azure/core/diagnostics/logger.hpp`
+- Renamed `azure/core/http/policy.hpp` to `azure/core/http/policies/policy.hpp`
+- Renamed `azure/core/http/curl/curl.hpp` to `azure/core/http/curl_transport.hpp`
+- Renamed `azure/core/http/winhttp/win_http_client.hpp` to `azure/core/http/win_http_transport.hpp`
 
 ### Bug Fixes
 

sdk/core/azure-core/CMakeLists.txt

@@ -34,40 +34,40 @@ endif()
 
 if(BUILD_TRANSPORT_CURL)
   SET(CURL_TRANSPORT_ADAPTER_SRC src/http/curl/curl.cpp)
-  SET(CURL_TRANSPORT_ADAPTER_INC inc/azure/core/http/curl/curl.hpp)
+  SET(CURL_TRANSPORT_ADAPTER_INC inc/azure/core/http/curl_transport.hpp)
 endif()
 if(BUILD_TRANSPORT_WINHTTP)
   SET(WIN_TRANSPORT_ADAPTER_SRC src/http/winhttp/win_http_transport.cpp)
-  SET(WIN_TRANSPORT_ADAPTER_INC inc/azure/core/http/winhttp/win_http_client.hpp)
+  SET(WIN_TRANSPORT_ADAPTER_INC inc/azure/core/http/win_http_transport.hpp)
 endif()
 
 set(
   AZURE_CORE_HEADER
     ${CURL_TRANSPORT_ADAPTER_INC}
     ${WIN_TRANSPORT_ADAPTER_INC}
+    inc/azure/core/credentials/credentials.hpp
     inc/azure/core/cryptography/hash.hpp
+    inc/azure/core/diagnostics/logger.hpp
     inc/azure/core/http/http.hpp
-    inc/azure/core/http/policy.hpp
+    inc/azure/core/http/policies/policy.hpp
     inc/azure/core/http/transport.hpp
     inc/azure/core/internal/client_options.hpp
     inc/azure/core/internal/contract.hpp
+    inc/azure/core/internal/diagnostics/log.hpp
     inc/azure/core/internal/hkeyholder.hpp
     inc/azure/core/internal/http/pipeline.hpp
-    inc/azure/core/internal/json_serializable.hpp
-    inc/azure/core/internal/json.hpp
-    inc/azure/core/internal/log.hpp
-    inc/azure/core/internal/null_body_stream.hpp
+    inc/azure/core/internal/io/null_body_stream.hpp
+    inc/azure/core/internal/json/json_serializable.hpp
+    inc/azure/core/internal/json/json.hpp
     inc/azure/core/internal/strings.hpp
     inc/azure/core/io/body_stream.hpp
     inc/azure/core/base64.hpp
     inc/azure/core/case_insensitive_containers.hpp
     inc/azure/core/context.hpp
-    inc/azure/core/credentials.hpp
     inc/azure/core/datetime.hpp
     inc/azure/core/dll_import_export.hpp
     inc/azure/core/etag.hpp
     inc/azure/core/exception.hpp
-    inc/azure/core/logger.hpp
     inc/azure/core/match_conditions.hpp
     inc/azure/core/modified_conditions.hpp
     inc/azure/core/nullable.hpp
@@ -75,8 +75,8 @@ set(
     inc/azure/core/operation_status.hpp
     inc/azure/core/platform.hpp
     inc/azure/core/response.hpp
-    inc/azure/core/uuid.hpp
     inc/azure/core/url.hpp
+    inc/azure/core/uuid.hpp
     inc/azure/core/version.hpp
     inc/azure/core.hpp
 )

sdk/core/azure-core/inc/azure/core.hpp

@@ -12,13 +12,12 @@
 
 // azure/core
 #include "azure/core/base64.hpp"
+#include "azure/core/case_insensitive_containers.hpp"
 #include "azure/core/context.hpp"
-#include "azure/core/credentials.hpp"
 #include "azure/core/datetime.hpp"
 #include "azure/core/dll_import_export.hpp"
 #include "azure/core/etag.hpp"
 #include "azure/core/exception.hpp"
-#include "azure/core/logger.hpp"
 #include "azure/core/match_conditions.hpp"
 #include "azure/core/modified_conditions.hpp"
 #include "azure/core/nullable.hpp"
@@ -30,13 +29,21 @@
 #include "azure/core/uuid.hpp"
 #include "azure/core/version.hpp"
 
+// azure/core/credentials
+#include "azure/core/credentials/credentials.hpp"
+
 // azure/core/cryptography
 #include "azure/core/cryptography/hash.hpp"
 
+// azure/core/diagnostics
+#include "azure/core/diagnostics/logger.hpp"
+
 // azure/core/http
 #include "azure/core/http/http.hpp"
-#include "azure/core/http/policy.hpp"
 #include "azure/core/http/transport.hpp"
 
+// azure/core/http/policies
+#include "azure/core/http/policies/policy.hpp"
+
 // azure/core/io
 #include "azure/core/io/body_stream.hpp"

sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp

@@ -10,7 +10,7 @@
 
 #include "azure/core/case_insensitive_containers.hpp"
 #include "azure/core/context.hpp"
-#include "azure/core/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "azure/core/dll_import_export.hpp"
 #include "azure/core/http/http.hpp"
 #include "azure/core/http/transport.hpp"

sdk/core/azure-core/inc/azure/core/internal/client_options.hpp

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "azure/core/http/http.hpp"
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 
 #include <memory>
 #include <vector>

sdk/core/azure-core/inc/azure/core/internal/diagnostics/log.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "azure/core/diagnostics/logger.hpp"
 #include "azure/core/dll_import_export.hpp"
-#include "azure/core/logger.hpp"
 
 #include <atomic>
 #include <type_traits>

sdk/core/azure-core/inc/azure/core/internal/http/pipeline.hpp

@@ -11,7 +11,7 @@
 
 #include "azure/core/context.hpp"
 #include "azure/core/http/http.hpp"
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 #include "azure/core/http/transport.hpp"
 #include "azure/core/internal/client_options.hpp"
 

sdk/core/azure-core/src/environment_log_level_listener_private.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure/core/logger.hpp"
+#include "azure/core/diagnostics/logger.hpp"
 
 #if defined(AZ_PLATFORM_WINDOWS)
 #if !defined(WIN32_LEAN_AND_MEAN)

sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 
 #include <chrono>
 

sdk/core/azure-core/src/http/curl/curl.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/curl_transport.hpp"
 #include "azure/core/http/http.hpp"
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 #include "azure/core/http/transport.hpp"
-#include "azure/core/internal/log.hpp"
+#include "azure/core/internal/diagnostics/log.hpp"
 #include "azure/core/platform.hpp"
 
 // Private incude

sdk/core/azure-core/src/http/http.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/http/http.hpp"
-#include "azure/core/http/policy.hpp"
-#include "azure/core/internal/null_body_stream.hpp"
+#include "azure/core/http/policies/policy.hpp"
+#include "azure/core/internal/io/null_body_stream.hpp"
 #include "azure/core/url.hpp"
 
 #include <utility>

sdk/core/azure-core/src/http/log_policy.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policy.hpp"
-#include "azure/core/internal/log.hpp"
+#include "azure/core/http/policies/policy.hpp"
+#include "azure/core/internal/diagnostics/log.hpp"
 
 #include <algorithm>
 #include <chrono>

sdk/core/azure-core/src/http/policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 #include "azure/core/http/http.hpp"
 
 using Azure::Core::Context;

sdk/core/azure-core/src/http/retry_policy.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policy.hpp"
-#include "azure/core/internal/log.hpp"
+#include "azure/core/http/policies/policy.hpp"
+#include "azure/core/internal/diagnostics/log.hpp"
 
 #include <algorithm>
 #include <cstdlib>

sdk/core/azure-core/src/http/telemetry_policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 #include "azure/core/platform.hpp"
 
 #include <cctype>

sdk/core/azure-core/src/http/transport_policy.cpp

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policy.hpp"
+#include "azure/core/http/policies/policy.hpp"
 
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
-#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/curl_transport.hpp"
 #endif
 
 #if defined(BUILD_TRANSPORT_WINHTTP_ADAPTER)
-#include "azure/core/http/winhttp/win_http_client.hpp"
+#include "azure/core/http/win_http_transport.hpp"
 #endif
 
 using Azure::Core::Context;

sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp

@@ -4,7 +4,7 @@
 #include "azure/core/http/http.hpp"
 
 #if defined(BUILD_TRANSPORT_WINHTTP_ADAPTER)
-#include "azure/core/http/winhttp/win_http_client.hpp"
+#include "azure/core/http/win_http_transport.hpp"
 #endif
 
 #include <Windows.h>

sdk/core/azure-core/src/logger.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/logger.hpp"
-#include "azure/core/internal/log.hpp"
+#include "azure/core/diagnostics/logger.hpp"
+#include "azure/core/internal/diagnostics/log.hpp"
 
 #include <mutex>
 #include <shared_mutex>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-algorithms.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("algorithms")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-allocator.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-alt-string.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 
 #include <string>
 #include <utility>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-capacity.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("capacity")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-class_const_iterator.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-class_iterator.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-class_lexer.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-comparison.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 namespace {

sdk/core/azure-core/test/nlohmann-json-test/src/unit-concepts.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("concepts")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-constructor1.cpp

@@ -31,7 +31,7 @@ SOFTWARE.
 DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-constructor2.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("other constructors and destructor")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-convenience.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-conversions.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-deserialization.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <iostream>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-element_access1.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("element access 1")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-element_access2.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("element access 2")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-inspection.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <fstream>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-items.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #if (defined(__cplusplus) && __cplusplus >= 201703L) \

sdk/core/azure-core/test/nlohmann-json-test/src/unit-iterators1.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 
 #define private public
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 #undef private
 

sdk/core/azure-core/test/nlohmann-json-test/src/unit-iterators2.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("iterators 2")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-large_json.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <algorithm>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-modifiers.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("modifiers")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-noexcept.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 namespace {

sdk/core/azure-core/test/nlohmann-json-test/src/unit-pointer_access.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("pointer access")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-readme.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <deque>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-reference_access.cpp

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 TEST_CASE("reference access")

sdk/core/azure-core/test/nlohmann-json-test/src/unit-serialization.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <iomanip>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-testsuites.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <fstream>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-to_chars.cpp

@@ -33,7 +33,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::detail::dtoa_impl::reinterpret_bits;
 
 namespace {

sdk/core/azure-core/test/nlohmann-json-test/src/unit-udt.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <array>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-user_defined_input.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 #include <list>

sdk/core/azure-core/test/nlohmann-json-test/src/unit-wstring.cpp

@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 using Azure::Core::Json::_internal::json;
 
 namespace {

sdk/core/azure-core/test/ut/client_options.cpp

@@ -3,7 +3,7 @@
 
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/http/transport.hpp>
 #include <azure/core/internal/client_options.hpp>
 #include <gtest/gtest.h>

sdk/core/azure-core/test/ut/curl_connection_pool.cpp

@@ -3,11 +3,11 @@
 
 #include "transport_adapter_base.hpp"
 #include <azure/core/context.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/response.hpp>
 
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
-#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/curl_transport.hpp"
 #endif
 
 #include <iostream>

sdk/core/azure-core/test/ut/curl_options.cpp

@@ -5,13 +5,13 @@
 
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/http/transport.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
-#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/curl_transport.hpp"
 #endif
 
 #include <http/curl/curl_connection_private.hpp>

sdk/core/azure-core/test/ut/curl_session.hpp

@@ -18,7 +18,7 @@
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 #endif // _MSC_VER
 
-#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/curl_transport.hpp>
 #include <curl/curl.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

sdk/core/azure-core/test/ut/curl_session_test.cpp

@@ -3,7 +3,7 @@
 
 #include "curl_session.hpp"
 
-#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/curl_transport.hpp>
 #include <azure/core/http/http.hpp>
 
 #include <http/curl/curl_connection_private.hpp>

sdk/core/azure-core/test/ut/http.cpp

@@ -5,7 +5,7 @@
 
 #include "http.hpp"
 #include <azure/core/http/http.hpp>
-#include <azure/core/internal/null_body_stream.hpp>
+#include <azure/core/internal/io/null_body_stream.hpp>
 
 #include <string>
 #include <utility>

sdk/core/azure-core/test/ut/json.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 #include <gtest/gtest.h>
 
 using json = Azure::Core::Json::_internal::json;

sdk/core/azure-core/test/ut/logging.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/log.hpp>
+#include <azure/core/internal/diagnostics/log.hpp>
 #include <gtest/gtest.h>
 
 using Azure::Core::Diagnostics::Logger;

sdk/core/azure-core/test/ut/pipeline.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <gtest/gtest.h>
 

sdk/core/azure-core/test/ut/policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <gtest/gtest.h>
 

sdk/core/azure-core/test/ut/telemetry_policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <gtest/gtest.h>
 

sdk/core/azure-core/test/ut/transport_adapter_implementation.cpp

@@ -3,15 +3,15 @@
 
 #include "transport_adapter_base.hpp"
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/http/transport.hpp>
 
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
-#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/curl_transport.hpp"
 #endif
 
 #if defined(BUILD_TRANSPORT_WINHTTP_ADAPTER)
-#include "azure/core/http/winhttp/win_http_client.hpp"
+#include "azure/core/http/win_http_transport.hpp"
 #endif
 
 #include <string>

sdk/core/perf/inc/azure/perf/options.hpp

@@ -16,7 +16,7 @@
 #include "azure/perf/dynamic_test_options.hpp"
 #include "azure/perf/test_options.hpp"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 
 #include <iostream>
 #include <vector>

sdk/core/perf/src/program.cpp

@@ -4,7 +4,7 @@
 #include "azure/perf/program.hpp"
 #include "azure/perf/argagg.hpp"
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/strings.hpp>
 
 #include <chrono>

sdk/core/perf/test/inc/azure/perf/test/curl_http_client_get_test.hpp

@@ -11,7 +11,7 @@
 
 #include "azure/perf/test/http_client_get_test.hpp"
 
-#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/curl_transport.hpp>
 
 #include <curl/curl.h>
 

sdk/core/perf/test/inc/azure/perf/test/win_http_client_get_test.hpp

@@ -11,7 +11,7 @@
 
 #include "azure/perf/test/http_client_get_test.hpp"
 
-#include <azure/core/http/winhttp/win_http_client.hpp>
+#include <azure/core/http/win_http_transport.hpp>
 
 namespace Azure { namespace Perf { namespace Test {
 

sdk/identity/azure-identity/inc/azure/identity/client_secret_credential.hpp

@@ -10,8 +10,8 @@
 
 #include "azure/identity/dll_import_export.hpp"
 
-#include <azure/core/credentials.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/credentials/credentials.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/client_options.hpp>
 
 #include <string>

sdk/identity/azure-identity/inc/azure/identity/environment_credential.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 
 #include <memory>
 

sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_pipeline.hpp

@@ -12,8 +12,8 @@
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <azure/core/internal/json.hpp>
-#include <azure/core/internal/json_serializable.hpp>
+#include <azure/core/internal/json/json.hpp>
+#include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/response.hpp>
 
 #include <functional>

sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp

@@ -4,9 +4,9 @@
 #include "azure/keyvault/common/keyvault_exception.hpp"
 #include "azure/keyvault/common/keyvault_constants.hpp"
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 #include <type_traits>
 
 using namespace Azure::Security::KeyVault::Common;

sdk/keyvault/azure-security-keyvault-common/test/ut/pipeline_test.cpp

@@ -4,7 +4,7 @@
 #include "gtest/gtest.h"
 
 #include <azure/core/http/http.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/client_options.hpp>
 #include <azure/keyvault/common/internal/keyvault_pipeline.hpp>
 

sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <azure/core/internal/json_serializable.hpp>
+#include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/nullable.hpp>
 
 #include "azure/keyvault/keys/key_create_options.hpp"

sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp

@@ -7,7 +7,7 @@
 
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 
 using namespace Azure::Security::KeyVault::Keys;
 using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;

sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/http.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 
 #include "azure/keyvault/keys/details/key_constants.hpp"
 #include "azure/keyvault/keys/details/key_request_parameters.hpp"

sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 
 #include "azure/keyvault/keys/details/key_constants.hpp"
 #include "azure/keyvault/keys/details/key_request_parameters.hpp"

sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp

@@ -7,7 +7,7 @@
 
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 
 using namespace Azure::Security::KeyVault::Keys;
 using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
 #include "azure/storage/blobs/blob_options.hpp"

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
 #include "azure/storage/blobs/blob_container_client.hpp"

sdk/storage/azure-storage-blobs/src/blob_client.cpp

@@ -3,7 +3,7 @@
 
 #include "azure/storage/blobs/blob_client.hpp"
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/concurrent_transfer.hpp>
 #include <azure/storage/common/constants.hpp>
 #include <azure/storage/common/file_io.hpp>

sdk/storage/azure-storage-blobs/src/blob_container_client.cpp

@@ -3,7 +3,7 @@
 
 #include "azure/storage/blobs/blob_container_client.hpp"
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/constants.hpp>
 #include <azure/storage/common/shared_key_policy.hpp>
 #include <azure/storage/common/storage_common.hpp>

sdk/storage/azure-storage-blobs/src/blob_service_client.cpp

@@ -3,7 +3,7 @@
 
 #include "azure/storage/blobs/blob_service_client.hpp"
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/constants.hpp>
 #include <azure/storage/common/shared_key_policy.hpp>
 #include <azure/storage/common/storage_common.hpp>

sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 
 #include "azure/storage/common/storage_credential.hpp"
 

sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <azure/core/case_insensitive_containers.hpp>
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 
 #include "azure/storage/common/constants.hpp"
 #include "azure/storage/common/storage_per_retry_policy.hpp"

sdk/storage/azure-storage-common/inc/azure/storage/common/storage_per_retry_policy.hpp

@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 
 namespace Azure { namespace Storage { namespace _detail {
 

sdk/storage/azure-storage-common/inc/azure/storage/common/storage_switch_to_secondary_policy.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 
 namespace Azure { namespace Storage { namespace _detail {
 

sdk/storage/azure-storage-common/src/storage_exception.cpp

@@ -5,8 +5,8 @@
 
 #include <type_traits>
 
-#include <azure/core/http/policy.hpp>
-#include <azure/core/internal/json.hpp>
+#include <azure/core/http/policies/policy.hpp>
+#include <azure/core/internal/json/json.hpp>
 
 #include "azure/storage/common/constants.hpp"
 #include "azure/storage/common/xml_wrapper.hpp"

sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/common/storage_credential.hpp>

sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/blobs/block_blob_client.hpp>

sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/blobs/blob_container_client.hpp>

sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/blobs/blob_client.hpp>

sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include <azure/core/credentials.hpp>
+#include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/blobs/blob_service_client.hpp>

sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp

@@ -18,7 +18,7 @@
 #include <azure/core/etag.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <azure/core/internal/json.hpp>
+#include <azure/core/internal/json/json.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/common/crypt.hpp>

sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp

@@ -3,7 +3,7 @@
 
 #include "azure/storage/files/datalake/datalake_directory_client.hpp"
 
-#include <azure/core/http/policy.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/constants.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/shared_key_policy.hpp>