diff --git a/Code/Framework/AzCore/AzCore/Android/APKFileHandler.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Android/APKFileHandler.cpp
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/APKFileHandler.cpp
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/APKFileHandler.cpp
diff --git a/Code/Framework/AzCore/AzCore/Android/APKFileHandler.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/APKFileHandler.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/APKFileHandler.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/APKFileHandler.h
diff --git a/Code/Framework/AzCore/AzCore/Android/AndroidEnv.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Android/AndroidEnv.cpp
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/AndroidEnv.cpp
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/AndroidEnv.cpp
diff --git a/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/AndroidEnv.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/AndroidEnv.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/AndroidEnv.h
diff --git a/Code/Framework/AzCore/AzCore/Android/ApiLevel.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/ApiLevel.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/ApiLevel.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/ApiLevel.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/ClassName.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/ClassName.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Internal/ClassName.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/ClassName.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/JStringUtils.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/JStringUtils.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils_impl.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/JStringUtils_impl.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils_impl.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/JStringUtils_impl.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Object_impl.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/Object_impl.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Internal/Object_impl.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/Object_impl.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Signature_impl.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/Signature_impl.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Internal/Signature_impl.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Internal/Signature_impl.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/JNI.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/JNI.cpp
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/JNI.cpp
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/JNI.cpp
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/JNI.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/JNI.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/JNI.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/JNI.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Object.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Object.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Object.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Object.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Object_fwd.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Object_fwd.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Object_fwd.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Object_fwd.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/Signature.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Signature.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/Signature.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/Signature.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/scoped_ref.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/scoped_ref.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/scoped_ref.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/scoped_ref.h
diff --git a/Code/Framework/AzCore/AzCore/Android/JNI/shared_ref.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/shared_ref.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/JNI/shared_ref.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/JNI/shared_ref.h
diff --git a/Code/Framework/AzCore/AzCore/Android/Utils.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Android/Utils.cpp
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/Utils.cpp
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/Utils.cpp
diff --git a/Code/Framework/AzCore/AzCore/Android/Utils.h b/Code/Framework/AzCore/Platform/Android/AzCore/Android/Utils.h
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/Utils.h
rename to Code/Framework/AzCore/Platform/Android/AzCore/Android/Utils.h
diff --git a/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake b/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake
index 2ac4967b04..e72ae2a363 100644
--- a/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake
@@ -62,25 +62,25 @@ set(FILES
     ../Common/UnixLike/AzCore/std/time_UnixLike.cpp
     AzCore/Utils/Utils_Android.cpp
     ../Common/Unimplemented/AzCore/Utils/Utils_Unimplemented.cpp
-    ../../AzCore/Android/AndroidEnv.cpp
-    ../../AzCore/Android/AndroidEnv.h
-    ../../AzCore/Android/APKFileHandler.cpp
-    ../../AzCore/Android/APKFileHandler.h
-    ../../AzCore/Android/ApiLevel.h
-    ../../AzCore/Android/Utils.cpp
-    ../../AzCore/Android/Utils.h
-    ../../AzCore/Android/JNI/JNI.cpp
-    ../../AzCore/Android/JNI/JNI.h
-    ../../AzCore/Android/JNI/Object.h
-    ../../AzCore/Android/JNI/Object_fwd.h
-    ../../AzCore/Android/JNI/scoped_ref.h
-    ../../AzCore/Android/JNI/shared_ref.h
-    ../../AzCore/Android/JNI/Signature.h
-    ../../AzCore/Android/JNI/Internal/ClassName.h
-    ../../AzCore/Android/JNI/Internal/JStringUtils.h
-    ../../AzCore/Android/JNI/Internal/JStringUtils_impl.h
-    ../../AzCore/Android/JNI/Internal/Object_impl.h
-    ../../AzCore/Android/JNI/Internal/Signature_impl.h
+    AzCore/Android/AndroidEnv.cpp
+    AzCore/Android/AndroidEnv.h
+    AzCore/Android/APKFileHandler.cpp
+    AzCore/Android/APKFileHandler.h
+    AzCore/Android/ApiLevel.h
+    AzCore/Android/Utils.cpp
+    AzCore/Android/Utils.h
+    AzCore/Android/JNI/JNI.cpp
+    AzCore/Android/JNI/JNI.h
+    AzCore/Android/JNI/Object.h
+    AzCore/Android/JNI/Object_fwd.h
+    AzCore/Android/JNI/scoped_ref.h
+    AzCore/Android/JNI/shared_ref.h
+    AzCore/Android/JNI/Signature.h
+    AzCore/Android/JNI/Internal/ClassName.h
+    AzCore/Android/JNI/Internal/JStringUtils.h
+    AzCore/Android/JNI/Internal/JStringUtils_impl.h
+    AzCore/Android/JNI/Internal/Object_impl.h
+    AzCore/Android/JNI/Internal/Signature_impl.h
     AzCore/Debug/Profiler_Platform.inl
     AzCore/Debug/Profiler_Android.inl
 )
diff --git a/Code/Framework/AzCore/AzCore/Android/Tests/JNI/Signature_tests.cpp b/Code/Framework/AzCore/Tests/Platform/Android/Tests/JNI/Signature_tests.cpp
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/Tests/JNI/Signature_tests.cpp
rename to Code/Framework/AzCore/Tests/Platform/Android/Tests/JNI/Signature_tests.cpp
diff --git a/Code/Framework/AzCore/AzCore/Android/Tests/JNI/shared_ref_tests.cpp b/Code/Framework/AzCore/Tests/Platform/Android/Tests/JNI/shared_ref_tests.cpp
similarity index 100%
rename from Code/Framework/AzCore/AzCore/Android/Tests/JNI/shared_ref_tests.cpp
rename to Code/Framework/AzCore/Tests/Platform/Android/Tests/JNI/shared_ref_tests.cpp