Update the folder structure for the AWSMetrics gem following the latest O3DE guidline (#5028)

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>

Gems/AWSMetrics/Code/CMakeLists.txt

@@ -13,9 +13,9 @@ ly_add_target(
         awsmetrics_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -32,9 +32,9 @@ ly_add_target(
         awsmetrics_shared_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -88,8 +88,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awsmetrics_tests_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
-                Include/Public
+                Include
+                Source
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE

Gems/AWSMetrics/Code/awsmetrics_files.cmake

@@ -7,27 +7,28 @@
 #
 
 set(FILES
-    Include/Public/AWSMetricsBus.h
-    Include/Public/MetricsAttribute.h
-    Include/Private/AWSMetricsConstant.h
-    Include/Private/AWSMetricsServiceApi.h
-    Include/Private/AWSMetricsSystemComponent.h
-    Include/Private/ClientConfiguration.h
-    Include/Private/DefaultClientIdProvider.h
-    Include/Private/GlobalStatistics.h
-    Include/Private/IdentityProvider.h
-    Include/Private/MetricsEvent.h
-    Include/Private/MetricsEventBuilder.h    
-    Include/Private/MetricsManager.h
-    Include/Private/MetricsQueue.h
-    Source/ClientConfiguration.cpp
-    Source/DefaultClientIdProvider.cpp
+    Include/AWSMetricsBus.h
+    Include/MetricsAttribute.h
+
+    Source/AWSMetricsConstant.h
     Source/AWSMetricsServiceApi.cpp
+    Source/AWSMetricsServiceApi.h
     Source/AWSMetricsSystemComponent.cpp
+    Source/AWSMetricsSystemComponent.h
+    Source/ClientConfiguration.cpp
+    Source/ClientConfiguration.h
+    Source/DefaultClientIdProvider.h
+    Source/DefaultClientIdProvider.cpp
+    Source/GlobalStatistics.h
     Source/IdentityProvider.cpp
-    Source/MetricsEvent.cpp
-    Source/MetricsEventBuilder.cpp
+    Source/IdentityProvider.h
     Source/MetricsAttribute.cpp
+    Source/MetricsEvent.cpp
+    Source/MetricsEvent.h
+    Source/MetricsEventBuilder.cpp
+    Source/MetricsEventBuilder.h
     Source/MetricsManager.cpp
+    Source/MetricsManager.h
     Source/MetricsQueue.cpp
+    Source/MetricsQueue.h
 )

Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake

@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSMetricsModule.h
     Source/AWSMetricsModule.cpp
+    Source/AWSMetricsModule.h
 )