diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt
index 1a6be2ba5..96a55c790 100644
--- a/sdk/tables/azure-data-tables/CMakeLists.txt
+++ b/sdk/tables/azure-data-tables/CMakeLists.txt
@@ -46,12 +46,6 @@ set(
     inc/azure/data/tables/credentials/named_key_credential.hpp
     inc/azure/data/tables/dll_import_export.hpp
     inc/azure/data/tables/enum_operators.hpp
-    inc/azure/data/tables/internal/policies/service_version_policy.hpp
-    inc/azure/data/tables/internal/policies/shared_key_lite_policy.hpp
-    inc/azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp
-    inc/azure/data/tables/internal/policies/timeout_policy.hpp
-    inc/azure/data/tables/internal/serializers.hpp
-    inc/azure/data/tables/internal/xml_wrapper.hpp
     inc/azure/data/tables/models.hpp
     inc/azure/data/tables/rtti.hpp
     inc/azure/data/tables.hpp
@@ -69,8 +63,14 @@ set(
     src/policies/tenant_bearer_token_policy.cpp
     src/policies/timeout_policy.cpp
     src/private/hmacsha256.hpp
-    src/private/url_encode.hpp
     src/private/package_version.hpp
+    src/private/policies/service_version_policy.hpp
+    src/private/policies/shared_key_lite_policy.hpp
+    src/private/policies/tenant_bearer_token_policy.hpp
+    src/private/policies/timeout_policy.hpp
+    src/private/serializers.hpp
+    src/private/url_encode.hpp
+    src/private/xml_wrapper.hpp
     src/serializers.cpp
     src/tables_clients.cpp
     src/tables_sas_builder.cpp
diff --git a/sdk/tables/azure-data-tables/src/policies/shared_key_lite_policy.cpp b/sdk/tables/azure-data-tables/src/policies/shared_key_lite_policy.cpp
index 78819fbc0..eb7e7cdf3 100644
--- a/sdk/tables/azure-data-tables/src/policies/shared_key_lite_policy.cpp
+++ b/sdk/tables/azure-data-tables/src/policies/shared_key_lite_policy.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/data/tables/internal/policies/shared_key_lite_policy.hpp"
+#include "../private/policies/shared_key_lite_policy.hpp"
 
 #include "../private/hmacsha256.hpp"
 
diff --git a/sdk/tables/azure-data-tables/src/policies/tenant_bearer_token_policy.cpp b/sdk/tables/azure-data-tables/src/policies/tenant_bearer_token_policy.cpp
index 868bcd9d0..b7240bf21 100644
--- a/sdk/tables/azure-data-tables/src/policies/tenant_bearer_token_policy.cpp
+++ b/sdk/tables/azure-data-tables/src/policies/tenant_bearer_token_policy.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
-#include "azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp"
+
+#include "../private/policies/tenant_bearer_token_policy.hpp"
 
 #include <azure/core/internal/credentials/authorization_challenge_parser.hpp>
 
diff --git a/sdk/tables/azure-data-tables/src/policies/timeout_policy.cpp b/sdk/tables/azure-data-tables/src/policies/timeout_policy.cpp
index 485b577bb..c3e0de309 100644
--- a/sdk/tables/azure-data-tables/src/policies/timeout_policy.cpp
+++ b/sdk/tables/azure-data-tables/src/policies/timeout_policy.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/data/tables/internal/policies/timeout_policy.hpp"
+#include "../private/policies/timeout_policy.hpp"
 
 #include <azure/core/datetime.hpp>
 #include <azure/core/platform.hpp>
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/service_version_policy.hpp b/sdk/tables/azure-data-tables/src/private/policies/service_version_policy.hpp
similarity index 100%
rename from sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/service_version_policy.hpp
rename to sdk/tables/azure-data-tables/src/private/policies/service_version_policy.hpp
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/shared_key_lite_policy.hpp b/sdk/tables/azure-data-tables/src/private/policies/shared_key_lite_policy.hpp
similarity index 100%
rename from sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/shared_key_lite_policy.hpp
rename to sdk/tables/azure-data-tables/src/private/policies/shared_key_lite_policy.hpp
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp b/sdk/tables/azure-data-tables/src/private/policies/tenant_bearer_token_policy.hpp
similarity index 100%
rename from sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp
rename to sdk/tables/azure-data-tables/src/private/policies/tenant_bearer_token_policy.hpp
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/timeout_policy.hpp b/sdk/tables/azure-data-tables/src/private/policies/timeout_policy.hpp
similarity index 100%
rename from sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/timeout_policy.hpp
rename to sdk/tables/azure-data-tables/src/private/policies/timeout_policy.hpp
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp b/sdk/tables/azure-data-tables/src/private/serializers.hpp
similarity index 97%
rename from sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp
rename to sdk/tables/azure-data-tables/src/private/serializers.hpp
index 197229270..209a0d54f 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp
+++ b/sdk/tables/azure-data-tables/src/private/serializers.hpp
@@ -2,8 +2,9 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
-#include "azure/data/tables/internal/xml_wrapper.hpp"
+
 #include "azure/data/tables/models.hpp"
+#include "xml_wrapper.hpp"
 
 #include <azure/core/internal/json/json.hpp>
 
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/xml_wrapper.hpp b/sdk/tables/azure-data-tables/src/private/xml_wrapper.hpp
similarity index 100%
rename from sdk/tables/azure-data-tables/inc/azure/data/tables/internal/xml_wrapper.hpp
rename to sdk/tables/azure-data-tables/src/private/xml_wrapper.hpp
diff --git a/sdk/tables/azure-data-tables/src/serializers.cpp b/sdk/tables/azure-data-tables/src/serializers.cpp
index e01cf71c5..26131a0dd 100644
--- a/sdk/tables/azure-data-tables/src/serializers.cpp
+++ b/sdk/tables/azure-data-tables/src/serializers.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/data/tables/internal/serializers.hpp"
+#include "private/serializers.hpp"
 
 #include <azure/core/internal/json/json.hpp>
 
diff --git a/sdk/tables/azure-data-tables/src/tables_clients.cpp b/sdk/tables/azure-data-tables/src/tables_clients.cpp
index 9e404d6f7..423d45243 100644
--- a/sdk/tables/azure-data-tables/src/tables_clients.cpp
+++ b/sdk/tables/azure-data-tables/src/tables_clients.cpp
@@ -3,11 +3,11 @@
 
 #include "azure/data/tables/tables_clients.hpp"
 
-#include "azure/data/tables/internal/policies/service_version_policy.hpp"
-#include "azure/data/tables/internal/policies/shared_key_lite_policy.hpp"
-#include "azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp"
-#include "azure/data/tables/internal/policies/timeout_policy.hpp"
-#include "azure/data/tables/internal/serializers.hpp"
+#include "private/policies/service_version_policy.hpp"
+#include "private/policies/shared_key_lite_policy.hpp"
+#include "private/policies/tenant_bearer_token_policy.hpp"
+#include "private/policies/timeout_policy.hpp"
+#include "private/serializers.hpp"
 
 #include <sstream>
 #include <string>
diff --git a/sdk/tables/azure-data-tables/src/xml_wrapper.cpp b/sdk/tables/azure-data-tables/src/xml_wrapper.cpp
index eb045b2f6..80e650582 100644
--- a/sdk/tables/azure-data-tables/src/xml_wrapper.cpp
+++ b/sdk/tables/azure-data-tables/src/xml_wrapper.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/data/tables/internal/xml_wrapper.hpp"
+#include "private/xml_wrapper.hpp"
 
 #include <azure/core/platform.hpp>
 
diff --git a/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp b/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp
index a21c9a858..e4a84b6e9 100644
--- a/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp
+++ b/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/data/tables/internal/serializers.hpp"
+#include "../src/private/serializers.hpp"
 #include "azure/data/tables/tables_clients.hpp"
 #include "test/ut/test_base.hpp"
 
diff --git a/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp b/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp
index b74a93153..5a315ec7b 100644
--- a/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp
+++ b/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include "../src/private/hmacsha256.hpp"
+#include "../src/private/policies/shared_key_lite_policy.hpp"
 #include "azure/data/tables/credentials/named_key_credential.hpp"
-#include "azure/data/tables/internal/policies/shared_key_lite_policy.hpp"
 
 #include <azure/core/base64.hpp>
 #include <azure/core/cryptography/hash.hpp>