diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 91807c8eb0..cb84d251e5 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -5,8 +5,8 @@
 #
 #
 
-add_subdirectory(CryEngine)
 add_subdirectory(Framework)
 add_subdirectory(LauncherUnified)
+add_subdirectory(Legacy)
 add_subdirectory(Sandbox)
 add_subdirectory(Tools)
diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
index 0dd24261b8..cb1a0412cb 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
@@ -5596,7 +5596,7 @@ LUA_API const Node* lua_getDummyNode()
             // Debugging
             void Error(ScriptContext::ErrorType error, bool doStackTrace, const char* format, va_list mark)
             {
-                // max size due to requirements of \CryEngine\CrySystem\Log.h MAX_TEMP_LENGTH_SIZE(2048) minus room for the time stamp (128)
+                // max size due to requirements of \Legacy\CrySystem\Log.h MAX_TEMP_LENGTH_SIZE(2048) minus room for the time stamp (128)
                 // otherwise if the script passes in a string larger, their script will cause an assert 
                 char message[4096 - 128];
                 azvsnprintf(message, AZ_ARRAY_SIZE(message), format, mark);
diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h
index 3edb1c3c9c..a10f52e1d2 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h
@@ -20,11 +20,6 @@ namespace AZ
         //!
         //! See "StatisticalProfilerProxy.h" for more explanations on the meaning of Statistical Profiling.
         //!
-        //! See sample UnitTest code in "dev\Code\Framework\Tests\StatisticalProfiler.cpp" which is part of the "FrameworkTests"
-        //! project. Also, "dev\Code\CryEngine\Cry3DEngine\TerrainProfiler.h,.cpp"
-        //! and "dev\Code\CryEngine\RenderDll\Common\RendElements\TerrainUtils\Debug\TerrainProfiler.h,.cpp"
-        //! are good examples.
-        //!
         //! The StatisticalProfiler was made as a template to accommodate for several performance needs...
         //! If all the code that is being profiled is single threaded and you want to identify
         //! each statistic by its string name, then the default StatisticalProfiler<> works for you.
diff --git a/Code/CryEngine/CMakeLists.txt b/Code/Legacy/CMakeLists.txt
similarity index 100%
rename from Code/CryEngine/CMakeLists.txt
rename to Code/Legacy/CMakeLists.txt
diff --git a/Code/CryEngine/CryCommon/AndroidSpecific.h b/Code/Legacy/CryCommon/AndroidSpecific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/AndroidSpecific.h
rename to Code/Legacy/CryCommon/AndroidSpecific.h
diff --git a/Code/CryEngine/CryCommon/AnimKey.h b/Code/Legacy/CryCommon/AnimKey.h
similarity index 100%
rename from Code/CryEngine/CryCommon/AnimKey.h
rename to Code/Legacy/CryCommon/AnimKey.h
diff --git a/Code/CryEngine/CryCommon/AppleSpecific.h b/Code/Legacy/CryCommon/AppleSpecific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/AppleSpecific.h
rename to Code/Legacy/CryCommon/AppleSpecific.h
diff --git a/Code/CryEngine/CryCommon/BaseTypes.h b/Code/Legacy/CryCommon/BaseTypes.h
similarity index 100%
rename from Code/CryEngine/CryCommon/BaseTypes.h
rename to Code/Legacy/CryCommon/BaseTypes.h
diff --git a/Code/CryEngine/CryCommon/BitFiddling.h b/Code/Legacy/CryCommon/BitFiddling.h
similarity index 100%
rename from Code/CryEngine/CryCommon/BitFiddling.h
rename to Code/Legacy/CryCommon/BitFiddling.h
diff --git a/Code/CryEngine/CryCommon/CMakeLists.txt b/Code/Legacy/CryCommon/CMakeLists.txt
similarity index 83%
rename from Code/CryEngine/CryCommon/CMakeLists.txt
rename to Code/Legacy/CryCommon/CMakeLists.txt
index 6c00cc5071..93754aa9aa 100644
--- a/Code/CryEngine/CryCommon/CMakeLists.txt
+++ b/Code/Legacy/CryCommon/CMakeLists.txt
@@ -13,7 +13,7 @@ ly_add_target(
     INCLUDE_DIRECTORIES
         PUBLIC
             .         # Lots of code without CryCommon/
-            ..        # Dangerous since exports CryEngine's path (client code can do CrySystem/ without depending on that target)
+            ..        # Dangerous since exports Legacy's path (client code can do CrySystem/ without depending on that target)
     BUILD_DEPENDENCIES
         PUBLIC
             AZ::AzCore
diff --git a/Code/CryEngine/CryCommon/Common_TypeInfo.cpp b/Code/Legacy/CryCommon/Common_TypeInfo.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/Common_TypeInfo.cpp
rename to Code/Legacy/CryCommon/Common_TypeInfo.cpp
diff --git a/Code/CryEngine/CryCommon/CompileTimeAssert.h b/Code/Legacy/CryCommon/CompileTimeAssert.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CompileTimeAssert.h
rename to Code/Legacy/CryCommon/CompileTimeAssert.h
diff --git a/Code/CryEngine/CryCommon/CryArray.h b/Code/Legacy/CryCommon/CryArray.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryArray.h
rename to Code/Legacy/CryCommon/CryArray.h
diff --git a/Code/CryEngine/CryCommon/CryAssert.h b/Code/Legacy/CryCommon/CryAssert.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryAssert.h
rename to Code/Legacy/CryCommon/CryAssert.h
diff --git a/Code/CryEngine/CryCommon/CryAssert_Android.h b/Code/Legacy/CryCommon/CryAssert_Android.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryAssert_Android.h
rename to Code/Legacy/CryCommon/CryAssert_Android.h
diff --git a/Code/CryEngine/CryCommon/CryAssert_Linux.h b/Code/Legacy/CryCommon/CryAssert_Linux.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryAssert_Linux.h
rename to Code/Legacy/CryCommon/CryAssert_Linux.h
diff --git a/Code/CryEngine/CryCommon/CryAssert_Mac.h b/Code/Legacy/CryCommon/CryAssert_Mac.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryAssert_Mac.h
rename to Code/Legacy/CryCommon/CryAssert_Mac.h
diff --git a/Code/CryEngine/CryCommon/CryAssert_iOS.h b/Code/Legacy/CryCommon/CryAssert_iOS.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryAssert_iOS.h
rename to Code/Legacy/CryCommon/CryAssert_iOS.h
diff --git a/Code/CryEngine/CryCommon/CryAssert_impl.h b/Code/Legacy/CryCommon/CryAssert_impl.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryAssert_impl.h
rename to Code/Legacy/CryCommon/CryAssert_impl.h
diff --git a/Code/CryEngine/CryCommon/CryCommon.cpp b/Code/Legacy/CryCommon/CryCommon.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/CryCommon.cpp
rename to Code/Legacy/CryCommon/CryCommon.cpp
diff --git a/Code/CryEngine/CryCommon/CryCrc32.h b/Code/Legacy/CryCommon/CryCrc32.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryCrc32.h
rename to Code/Legacy/CryCommon/CryCrc32.h
diff --git a/Code/CryEngine/CryCommon/CryCustomTypes.h b/Code/Legacy/CryCommon/CryCustomTypes.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryCustomTypes.h
rename to Code/Legacy/CryCommon/CryCustomTypes.h
diff --git a/Code/CryEngine/CryCommon/CryEndian.h b/Code/Legacy/CryCommon/CryEndian.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryEndian.h
rename to Code/Legacy/CryCommon/CryEndian.h
diff --git a/Code/CryEngine/CryCommon/CryFile.h b/Code/Legacy/CryCommon/CryFile.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryFile.h
rename to Code/Legacy/CryCommon/CryFile.h
diff --git a/Code/CryEngine/CryCommon/CryFixedString.h b/Code/Legacy/CryCommon/CryFixedString.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryFixedString.h
rename to Code/Legacy/CryCommon/CryFixedString.h
diff --git a/Code/CryEngine/CryCommon/CryHalf.inl b/Code/Legacy/CryCommon/CryHalf.inl
similarity index 100%
rename from Code/CryEngine/CryCommon/CryHalf.inl
rename to Code/Legacy/CryCommon/CryHalf.inl
diff --git a/Code/CryEngine/CryCommon/CryHalf_info.h b/Code/Legacy/CryCommon/CryHalf_info.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryHalf_info.h
rename to Code/Legacy/CryCommon/CryHalf_info.h
diff --git a/Code/CryEngine/CryCommon/CryHeaders.h b/Code/Legacy/CryCommon/CryHeaders.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryHeaders.h
rename to Code/Legacy/CryCommon/CryHeaders.h
diff --git a/Code/CryEngine/CryCommon/CryHeaders_info.cpp b/Code/Legacy/CryCommon/CryHeaders_info.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/CryHeaders_info.cpp
rename to Code/Legacy/CryCommon/CryHeaders_info.cpp
diff --git a/Code/CryEngine/CryCommon/CryLegacyAllocator.h b/Code/Legacy/CryCommon/CryLegacyAllocator.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryLegacyAllocator.h
rename to Code/Legacy/CryCommon/CryLegacyAllocator.h
diff --git a/Code/CryEngine/CryCommon/CryLibrary.cpp b/Code/Legacy/CryCommon/CryLibrary.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/CryLibrary.cpp
rename to Code/Legacy/CryCommon/CryLibrary.cpp
diff --git a/Code/CryEngine/CryCommon/CryLibrary.h b/Code/Legacy/CryCommon/CryLibrary.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryLibrary.h
rename to Code/Legacy/CryCommon/CryLibrary.h
diff --git a/Code/CryEngine/CryCommon/CryListenerSet.h b/Code/Legacy/CryCommon/CryListenerSet.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryListenerSet.h
rename to Code/Legacy/CryCommon/CryListenerSet.h
diff --git a/Code/CryEngine/CryCommon/CryName.h b/Code/Legacy/CryCommon/CryName.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryName.h
rename to Code/Legacy/CryCommon/CryName.h
diff --git a/Code/CryEngine/CryCommon/CryPath.h b/Code/Legacy/CryCommon/CryPath.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryPath.h
rename to Code/Legacy/CryCommon/CryPath.h
diff --git a/Code/CryEngine/CryCommon/CryPodArray.h b/Code/Legacy/CryCommon/CryPodArray.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryPodArray.h
rename to Code/Legacy/CryCommon/CryPodArray.h
diff --git a/Code/CryEngine/CryCommon/CryRandomInternal.h b/Code/Legacy/CryCommon/CryRandomInternal.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryRandomInternal.h
rename to Code/Legacy/CryCommon/CryRandomInternal.h
diff --git a/Code/CryEngine/CryCommon/CrySizer.h b/Code/Legacy/CryCommon/CrySizer.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CrySizer.h
rename to Code/Legacy/CryCommon/CrySizer.h
diff --git a/Code/CryEngine/CryCommon/CryString.h b/Code/Legacy/CryCommon/CryString.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryString.h
rename to Code/Legacy/CryCommon/CryString.h
diff --git a/Code/CryEngine/CryCommon/CrySystemBus.h b/Code/Legacy/CryCommon/CrySystemBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CrySystemBus.h
rename to Code/Legacy/CryCommon/CrySystemBus.h
diff --git a/Code/CryEngine/CryCommon/CryThread.h b/Code/Legacy/CryCommon/CryThread.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThread.h
rename to Code/Legacy/CryCommon/CryThread.h
diff --git a/Code/CryEngine/CryCommon/CryThreadImpl.h b/Code/Legacy/CryCommon/CryThreadImpl.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThreadImpl.h
rename to Code/Legacy/CryCommon/CryThreadImpl.h
diff --git a/Code/CryEngine/CryCommon/CryThreadImpl_pthreads.h b/Code/Legacy/CryCommon/CryThreadImpl_pthreads.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThreadImpl_pthreads.h
rename to Code/Legacy/CryCommon/CryThreadImpl_pthreads.h
diff --git a/Code/CryEngine/CryCommon/CryThreadImpl_windows.h b/Code/Legacy/CryCommon/CryThreadImpl_windows.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThreadImpl_windows.h
rename to Code/Legacy/CryCommon/CryThreadImpl_windows.h
diff --git a/Code/CryEngine/CryCommon/CryThread_dummy.h b/Code/Legacy/CryCommon/CryThread_dummy.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThread_dummy.h
rename to Code/Legacy/CryCommon/CryThread_dummy.h
diff --git a/Code/CryEngine/CryCommon/CryThread_pthreads.h b/Code/Legacy/CryCommon/CryThread_pthreads.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThread_pthreads.h
rename to Code/Legacy/CryCommon/CryThread_pthreads.h
diff --git a/Code/CryEngine/CryCommon/CryThread_windows.h b/Code/Legacy/CryCommon/CryThread_windows.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryThread_windows.h
rename to Code/Legacy/CryCommon/CryThread_windows.h
diff --git a/Code/CryEngine/CryCommon/CryTypeInfo.cpp b/Code/Legacy/CryCommon/CryTypeInfo.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/CryTypeInfo.cpp
rename to Code/Legacy/CryCommon/CryTypeInfo.cpp
diff --git a/Code/CryEngine/CryCommon/CryTypeInfo.h b/Code/Legacy/CryCommon/CryTypeInfo.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryTypeInfo.h
rename to Code/Legacy/CryCommon/CryTypeInfo.h
diff --git a/Code/CryEngine/CryCommon/CryVersion.h b/Code/Legacy/CryCommon/CryVersion.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryVersion.h
rename to Code/Legacy/CryCommon/CryVersion.h
diff --git a/Code/CryEngine/CryCommon/CryWindows.h b/Code/Legacy/CryCommon/CryWindows.h
similarity index 100%
rename from Code/CryEngine/CryCommon/CryWindows.h
rename to Code/Legacy/CryCommon/CryWindows.h
diff --git a/Code/CryEngine/CryCommon/Cry_Camera.h b/Code/Legacy/CryCommon/Cry_Camera.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Camera.h
rename to Code/Legacy/CryCommon/Cry_Camera.h
diff --git a/Code/CryEngine/CryCommon/Cry_Color.h b/Code/Legacy/CryCommon/Cry_Color.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Color.h
rename to Code/Legacy/CryCommon/Cry_Color.h
diff --git a/Code/CryEngine/CryCommon/Cry_Geo.h b/Code/Legacy/CryCommon/Cry_Geo.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Geo.h
rename to Code/Legacy/CryCommon/Cry_Geo.h
diff --git a/Code/CryEngine/CryCommon/Cry_GeoDistance.h b/Code/Legacy/CryCommon/Cry_GeoDistance.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_GeoDistance.h
rename to Code/Legacy/CryCommon/Cry_GeoDistance.h
diff --git a/Code/CryEngine/CryCommon/Cry_GeoIntersect.h b/Code/Legacy/CryCommon/Cry_GeoIntersect.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_GeoIntersect.h
rename to Code/Legacy/CryCommon/Cry_GeoIntersect.h
diff --git a/Code/CryEngine/CryCommon/Cry_GeoOverlap.h b/Code/Legacy/CryCommon/Cry_GeoOverlap.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_GeoOverlap.h
rename to Code/Legacy/CryCommon/Cry_GeoOverlap.h
diff --git a/Code/CryEngine/CryCommon/Cry_HWMatrix.h b/Code/Legacy/CryCommon/Cry_HWMatrix.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_HWMatrix.h
rename to Code/Legacy/CryCommon/Cry_HWMatrix.h
diff --git a/Code/CryEngine/CryCommon/Cry_HWVector3.h b/Code/Legacy/CryCommon/Cry_HWVector3.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_HWVector3.h
rename to Code/Legacy/CryCommon/Cry_HWVector3.h
diff --git a/Code/CryEngine/CryCommon/Cry_Math.h b/Code/Legacy/CryCommon/Cry_Math.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Math.h
rename to Code/Legacy/CryCommon/Cry_Math.h
diff --git a/Code/CryEngine/CryCommon/Cry_Matrix33.h b/Code/Legacy/CryCommon/Cry_Matrix33.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Matrix33.h
rename to Code/Legacy/CryCommon/Cry_Matrix33.h
diff --git a/Code/CryEngine/CryCommon/Cry_Matrix34.h b/Code/Legacy/CryCommon/Cry_Matrix34.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Matrix34.h
rename to Code/Legacy/CryCommon/Cry_Matrix34.h
diff --git a/Code/CryEngine/CryCommon/Cry_Matrix44.h b/Code/Legacy/CryCommon/Cry_Matrix44.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Matrix44.h
rename to Code/Legacy/CryCommon/Cry_Matrix44.h
diff --git a/Code/CryEngine/CryCommon/Cry_MatrixDiag.h b/Code/Legacy/CryCommon/Cry_MatrixDiag.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_MatrixDiag.h
rename to Code/Legacy/CryCommon/Cry_MatrixDiag.h
diff --git a/Code/CryEngine/CryCommon/Cry_Quat.h b/Code/Legacy/CryCommon/Cry_Quat.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Quat.h
rename to Code/Legacy/CryCommon/Cry_Quat.h
diff --git a/Code/CryEngine/CryCommon/Cry_ValidNumber.h b/Code/Legacy/CryCommon/Cry_ValidNumber.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_ValidNumber.h
rename to Code/Legacy/CryCommon/Cry_ValidNumber.h
diff --git a/Code/CryEngine/CryCommon/Cry_Vector2.h b/Code/Legacy/CryCommon/Cry_Vector2.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Vector2.h
rename to Code/Legacy/CryCommon/Cry_Vector2.h
diff --git a/Code/CryEngine/CryCommon/Cry_Vector3.h b/Code/Legacy/CryCommon/Cry_Vector3.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Vector3.h
rename to Code/Legacy/CryCommon/Cry_Vector3.h
diff --git a/Code/CryEngine/CryCommon/Cry_Vector4.h b/Code/Legacy/CryCommon/Cry_Vector4.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_Vector4.h
rename to Code/Legacy/CryCommon/Cry_Vector4.h
diff --git a/Code/CryEngine/CryCommon/Cry_XOptimise.h b/Code/Legacy/CryCommon/Cry_XOptimise.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Cry_XOptimise.h
rename to Code/Legacy/CryCommon/Cry_XOptimise.h
diff --git a/Code/CryEngine/CryCommon/FrameProfiler.h b/Code/Legacy/CryCommon/FrameProfiler.h
similarity index 100%
rename from Code/CryEngine/CryCommon/FrameProfiler.h
rename to Code/Legacy/CryCommon/FrameProfiler.h
diff --git a/Code/CryEngine/CryCommon/FunctorBaseFunction.h b/Code/Legacy/CryCommon/FunctorBaseFunction.h
similarity index 100%
rename from Code/CryEngine/CryCommon/FunctorBaseFunction.h
rename to Code/Legacy/CryCommon/FunctorBaseFunction.h
diff --git a/Code/CryEngine/CryCommon/FunctorBaseMember.h b/Code/Legacy/CryCommon/FunctorBaseMember.h
similarity index 100%
rename from Code/CryEngine/CryCommon/FunctorBaseMember.h
rename to Code/Legacy/CryCommon/FunctorBaseMember.h
diff --git a/Code/CryEngine/CryCommon/HMDBus.h b/Code/Legacy/CryCommon/HMDBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/HMDBus.h
rename to Code/Legacy/CryCommon/HMDBus.h
diff --git a/Code/CryEngine/CryCommon/HeapAllocator.h b/Code/Legacy/CryCommon/HeapAllocator.h
similarity index 100%
rename from Code/CryEngine/CryCommon/HeapAllocator.h
rename to Code/Legacy/CryCommon/HeapAllocator.h
diff --git a/Code/CryEngine/CryCommon/HeightmapUpdateNotificationBus.h b/Code/Legacy/CryCommon/HeightmapUpdateNotificationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/HeightmapUpdateNotificationBus.h
rename to Code/Legacy/CryCommon/HeightmapUpdateNotificationBus.h
diff --git a/Code/CryEngine/CryCommon/IAudioInterfacesCommonData.h b/Code/Legacy/CryCommon/IAudioInterfacesCommonData.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IAudioInterfacesCommonData.h
rename to Code/Legacy/CryCommon/IAudioInterfacesCommonData.h
diff --git a/Code/CryEngine/CryCommon/IAudioSystem.h b/Code/Legacy/CryCommon/IAudioSystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IAudioSystem.h
rename to Code/Legacy/CryCommon/IAudioSystem.h
diff --git a/Code/CryEngine/CryCommon/ICmdLine.h b/Code/Legacy/CryCommon/ICmdLine.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ICmdLine.h
rename to Code/Legacy/CryCommon/ICmdLine.h
diff --git a/Code/CryEngine/CryCommon/IConsole.h b/Code/Legacy/CryCommon/IConsole.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IConsole.h
rename to Code/Legacy/CryCommon/IConsole.h
diff --git a/Code/CryEngine/CryCommon/IEntityRenderState.h b/Code/Legacy/CryCommon/IEntityRenderState.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IEntityRenderState.h
rename to Code/Legacy/CryCommon/IEntityRenderState.h
diff --git a/Code/CryEngine/CryCommon/IEntityRenderState_info.cpp b/Code/Legacy/CryCommon/IEntityRenderState_info.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/IEntityRenderState_info.cpp
rename to Code/Legacy/CryCommon/IEntityRenderState_info.cpp
diff --git a/Code/CryEngine/CryCommon/IFont.h b/Code/Legacy/CryCommon/IFont.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IFont.h
rename to Code/Legacy/CryCommon/IFont.h
diff --git a/Code/CryEngine/CryCommon/IFunctorBase.h b/Code/Legacy/CryCommon/IFunctorBase.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IFunctorBase.h
rename to Code/Legacy/CryCommon/IFunctorBase.h
diff --git a/Code/CryEngine/CryCommon/IGem.h b/Code/Legacy/CryCommon/IGem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IGem.h
rename to Code/Legacy/CryCommon/IGem.h
diff --git a/Code/CryEngine/CryCommon/IIndexedMesh.h b/Code/Legacy/CryCommon/IIndexedMesh.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IIndexedMesh.h
rename to Code/Legacy/CryCommon/IIndexedMesh.h
diff --git a/Code/CryEngine/CryCommon/IIndexedMesh_info.cpp b/Code/Legacy/CryCommon/IIndexedMesh_info.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/IIndexedMesh_info.cpp
rename to Code/Legacy/CryCommon/IIndexedMesh_info.cpp
diff --git a/Code/CryEngine/CryCommon/ILevelSystem.h b/Code/Legacy/CryCommon/ILevelSystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ILevelSystem.h
rename to Code/Legacy/CryCommon/ILevelSystem.h
diff --git a/Code/CryEngine/CryCommon/ILocalizationManager.h b/Code/Legacy/CryCommon/ILocalizationManager.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ILocalizationManager.h
rename to Code/Legacy/CryCommon/ILocalizationManager.h
diff --git a/Code/CryEngine/CryCommon/ILog.h b/Code/Legacy/CryCommon/ILog.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ILog.h
rename to Code/Legacy/CryCommon/ILog.h
diff --git a/Code/CryEngine/CryCommon/IMNM.h b/Code/Legacy/CryCommon/IMNM.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IMNM.h
rename to Code/Legacy/CryCommon/IMNM.h
diff --git a/Code/CryEngine/CryCommon/IMaterial.h b/Code/Legacy/CryCommon/IMaterial.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IMaterial.h
rename to Code/Legacy/CryCommon/IMaterial.h
diff --git a/Code/CryEngine/CryCommon/IMiniLog.h b/Code/Legacy/CryCommon/IMiniLog.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IMiniLog.h
rename to Code/Legacy/CryCommon/IMiniLog.h
diff --git a/Code/CryEngine/CryCommon/IMovieSystem.h b/Code/Legacy/CryCommon/IMovieSystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IMovieSystem.h
rename to Code/Legacy/CryCommon/IMovieSystem.h
diff --git a/Code/CryEngine/CryCommon/INavigationSystem.h b/Code/Legacy/CryCommon/INavigationSystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/INavigationSystem.h
rename to Code/Legacy/CryCommon/INavigationSystem.h
diff --git a/Code/CryEngine/CryCommon/IPathfinder.h b/Code/Legacy/CryCommon/IPathfinder.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IPathfinder.h
rename to Code/Legacy/CryCommon/IPathfinder.h
diff --git a/Code/CryEngine/CryCommon/IPhysics.h b/Code/Legacy/CryCommon/IPhysics.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IPhysics.h
rename to Code/Legacy/CryCommon/IPhysics.h
diff --git a/Code/CryEngine/CryCommon/IPostEffectGroup.h b/Code/Legacy/CryCommon/IPostEffectGroup.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IPostEffectGroup.h
rename to Code/Legacy/CryCommon/IPostEffectGroup.h
diff --git a/Code/CryEngine/CryCommon/IProcess.h b/Code/Legacy/CryCommon/IProcess.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IProcess.h
rename to Code/Legacy/CryCommon/IProcess.h
diff --git a/Code/CryEngine/CryCommon/IReadWriteXMLSink.h b/Code/Legacy/CryCommon/IReadWriteXMLSink.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IReadWriteXMLSink.h
rename to Code/Legacy/CryCommon/IReadWriteXMLSink.h
diff --git a/Code/CryEngine/CryCommon/IRenderAuxGeom.h b/Code/Legacy/CryCommon/IRenderAuxGeom.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IRenderAuxGeom.h
rename to Code/Legacy/CryCommon/IRenderAuxGeom.h
diff --git a/Code/CryEngine/CryCommon/IRenderMesh.h b/Code/Legacy/CryCommon/IRenderMesh.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IRenderMesh.h
rename to Code/Legacy/CryCommon/IRenderMesh.h
diff --git a/Code/CryEngine/CryCommon/IRenderer.h b/Code/Legacy/CryCommon/IRenderer.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IRenderer.h
rename to Code/Legacy/CryCommon/IRenderer.h
diff --git a/Code/CryEngine/CryCommon/ISerialize.h b/Code/Legacy/CryCommon/ISerialize.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ISerialize.h
rename to Code/Legacy/CryCommon/ISerialize.h
diff --git a/Code/CryEngine/CryCommon/IShader.h b/Code/Legacy/CryCommon/IShader.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IShader.h
rename to Code/Legacy/CryCommon/IShader.h
diff --git a/Code/CryEngine/CryCommon/ISplines.h b/Code/Legacy/CryCommon/ISplines.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ISplines.h
rename to Code/Legacy/CryCommon/ISplines.h
diff --git a/Code/CryEngine/CryCommon/IStatObj.h b/Code/Legacy/CryCommon/IStatObj.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IStatObj.h
rename to Code/Legacy/CryCommon/IStatObj.h
diff --git a/Code/CryEngine/CryCommon/IStereoRenderer.h b/Code/Legacy/CryCommon/IStereoRenderer.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IStereoRenderer.h
rename to Code/Legacy/CryCommon/IStereoRenderer.h
diff --git a/Code/CryEngine/CryCommon/ISurfaceType.h b/Code/Legacy/CryCommon/ISurfaceType.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ISurfaceType.h
rename to Code/Legacy/CryCommon/ISurfaceType.h
diff --git a/Code/CryEngine/CryCommon/ISystem.h b/Code/Legacy/CryCommon/ISystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ISystem.h
rename to Code/Legacy/CryCommon/ISystem.h
diff --git a/Code/CryEngine/CryCommon/ITexture.h b/Code/Legacy/CryCommon/ITexture.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ITexture.h
rename to Code/Legacy/CryCommon/ITexture.h
diff --git a/Code/CryEngine/CryCommon/ITimer.h b/Code/Legacy/CryCommon/ITimer.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ITimer.h
rename to Code/Legacy/CryCommon/ITimer.h
diff --git a/Code/CryEngine/CryCommon/IValidator.h b/Code/Legacy/CryCommon/IValidator.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IValidator.h
rename to Code/Legacy/CryCommon/IValidator.h
diff --git a/Code/CryEngine/CryCommon/IViewSystem.h b/Code/Legacy/CryCommon/IViewSystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IViewSystem.h
rename to Code/Legacy/CryCommon/IViewSystem.h
diff --git a/Code/CryEngine/CryCommon/IWindowMessageHandler.h b/Code/Legacy/CryCommon/IWindowMessageHandler.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IWindowMessageHandler.h
rename to Code/Legacy/CryCommon/IWindowMessageHandler.h
diff --git a/Code/CryEngine/CryCommon/IXml.h b/Code/Legacy/CryCommon/IXml.h
similarity index 100%
rename from Code/CryEngine/CryCommon/IXml.h
rename to Code/Legacy/CryCommon/IXml.h
diff --git a/Code/CryEngine/CryCommon/LCGRandom.h b/Code/Legacy/CryCommon/LCGRandom.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LCGRandom.h
rename to Code/Legacy/CryCommon/LCGRandom.h
diff --git a/Code/CryEngine/CryCommon/LegacyAllocator.h b/Code/Legacy/CryCommon/LegacyAllocator.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LegacyAllocator.h
rename to Code/Legacy/CryCommon/LegacyAllocator.h
diff --git a/Code/CryEngine/CryCommon/Linux32Specific.h b/Code/Legacy/CryCommon/Linux32Specific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Linux32Specific.h
rename to Code/Legacy/CryCommon/Linux32Specific.h
diff --git a/Code/CryEngine/CryCommon/Linux64Specific.h b/Code/Legacy/CryCommon/Linux64Specific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Linux64Specific.h
rename to Code/Legacy/CryCommon/Linux64Specific.h
diff --git a/Code/CryEngine/CryCommon/LinuxSpecific.h b/Code/Legacy/CryCommon/LinuxSpecific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LinuxSpecific.h
rename to Code/Legacy/CryCommon/LinuxSpecific.h
diff --git a/Code/CryEngine/CryCommon/Linux_Win32Wrapper.h b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Linux_Win32Wrapper.h
rename to Code/Legacy/CryCommon/Linux_Win32Wrapper.h
diff --git a/Code/CryEngine/CryCommon/LoadScreenBus.h b/Code/Legacy/CryCommon/LoadScreenBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LoadScreenBus.h
rename to Code/Legacy/CryCommon/LoadScreenBus.h
diff --git a/Code/CryEngine/CryCommon/LocalizationManagerBus.h b/Code/Legacy/CryCommon/LocalizationManagerBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LocalizationManagerBus.h
rename to Code/Legacy/CryCommon/LocalizationManagerBus.h
diff --git a/Code/CryEngine/CryCommon/LocalizationManagerBus.inl b/Code/Legacy/CryCommon/LocalizationManagerBus.inl
similarity index 100%
rename from Code/CryEngine/CryCommon/LocalizationManagerBus.inl
rename to Code/Legacy/CryCommon/LocalizationManagerBus.inl
diff --git a/Code/CryEngine/CryCommon/LyShine/Animation/IUiAnimation.h b/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Animation/IUiAnimation.h
rename to Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h b/Code/Legacy/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h b/Code/Legacy/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimateEntityBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiAnimateEntityBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiAnimateEntityBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiAnimateEntityBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiAnimationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiAnimationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiAnimationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiButtonBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiButtonBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiButtonBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiButtonBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiCanvasBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasManagerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCheckboxBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCheckboxBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiCheckboxBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiCheckboxBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCursorBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiCursorBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDraggableBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDraggableBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiDraggableBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiDraggableBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropTargetBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDropTargetBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiDropTargetBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiDropTargetBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiDropdownBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownOptionBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiEditorBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiEditorBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorCanvasBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiElementBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiElementBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiElementBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiElementBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEntityContextBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEntityContextBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiEntityContextBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiEntityContextBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiFaderBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiFaderBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiFaderBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiFaderBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiGameEntityContextBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiImageBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiImageBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiImageBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiImageBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiImageSequenceBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiImageSequenceBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiImageSequenceBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiImageSequenceBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiIndexableImageBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiIndexableImageBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiIndexableImageBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiIndexableImageBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInitializationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInitializationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiInitializationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiInitializationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableActionsBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiInteractableBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableStatesBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractionMaskBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutColumnBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutControllerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutControllerBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutControllerBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutControllerBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutFitterBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutGridBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutGridBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutGridBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutGridBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutManagerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutRowBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutRowBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutRowBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiLayoutRowBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiMarkupButtonBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiMaskBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiMaskBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiMaskBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiMaskBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiNavigationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiNavigationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiNavigationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiNavigationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiParticleEmitterBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRenderBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiRenderBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiRenderBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderControlBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRenderControlBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiRenderControlBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiRenderControlBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBarBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBarBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBarBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiScrollBarBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBoxBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBoxBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBoxBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiScrollBoxBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollableBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollableBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiScrollableBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiScrollableBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollerBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiScrollerBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiScrollerBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiSliderBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiSliderBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiSliderBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiSliderBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiSpawnerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiSpawnerBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiSpawnerBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiSpawnerBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiSystemBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiSystemBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiSystemBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiSystemBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTextBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTextBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTextBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTextBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTextInputBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTextInputBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTextInputBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTextInputBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTooltipBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTransform2dBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTransform2dBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTransformBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiTransformBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiVisualBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiVisualBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/UiVisualBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/UiVisualBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h b/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h b/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h
rename to Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h
diff --git a/Code/CryEngine/CryCommon/LyShine/IDraw2d.h b/Code/Legacy/CryCommon/LyShine/IDraw2d.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/IDraw2d.h
rename to Code/Legacy/CryCommon/LyShine/IDraw2d.h
diff --git a/Code/CryEngine/CryCommon/LyShine/ILyShine.h b/Code/Legacy/CryCommon/LyShine/ILyShine.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/ILyShine.h
rename to Code/Legacy/CryCommon/LyShine/ILyShine.h
diff --git a/Code/CryEngine/CryCommon/LyShine/IRenderGraph.h b/Code/Legacy/CryCommon/LyShine/IRenderGraph.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/IRenderGraph.h
rename to Code/Legacy/CryCommon/LyShine/IRenderGraph.h
diff --git a/Code/CryEngine/CryCommon/LyShine/ISprite.h b/Code/Legacy/CryCommon/LyShine/ISprite.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/ISprite.h
rename to Code/Legacy/CryCommon/LyShine/ISprite.h
diff --git a/Code/CryEngine/CryCommon/LyShine/UiAssetTypes.h b/Code/Legacy/CryCommon/LyShine/UiAssetTypes.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/UiAssetTypes.h
rename to Code/Legacy/CryCommon/LyShine/UiAssetTypes.h
diff --git a/Code/CryEngine/CryCommon/LyShine/UiBase.h b/Code/Legacy/CryCommon/LyShine/UiBase.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/UiBase.h
rename to Code/Legacy/CryCommon/LyShine/UiBase.h
diff --git a/Code/CryEngine/CryCommon/LyShine/UiComponentTypes.h b/Code/Legacy/CryCommon/LyShine/UiComponentTypes.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/UiComponentTypes.h
rename to Code/Legacy/CryCommon/LyShine/UiComponentTypes.h
diff --git a/Code/CryEngine/CryCommon/LyShine/UiEntityContext.h b/Code/Legacy/CryCommon/LyShine/UiEntityContext.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/UiEntityContext.h
rename to Code/Legacy/CryCommon/LyShine/UiEntityContext.h
diff --git a/Code/CryEngine/CryCommon/LyShine/UiLayoutCellBase.h b/Code/Legacy/CryCommon/LyShine/UiLayoutCellBase.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/UiLayoutCellBase.h
rename to Code/Legacy/CryCommon/LyShine/UiLayoutCellBase.h
diff --git a/Code/CryEngine/CryCommon/LyShine/UiSerializeHelpers.h b/Code/Legacy/CryCommon/LyShine/UiSerializeHelpers.h
similarity index 100%
rename from Code/CryEngine/CryCommon/LyShine/UiSerializeHelpers.h
rename to Code/Legacy/CryCommon/LyShine/UiSerializeHelpers.h
diff --git a/Code/CryEngine/CryCommon/MTPseudoRandom.cpp b/Code/Legacy/CryCommon/MTPseudoRandom.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/MTPseudoRandom.cpp
rename to Code/Legacy/CryCommon/MTPseudoRandom.cpp
diff --git a/Code/CryEngine/CryCommon/MTPseudoRandom.h b/Code/Legacy/CryCommon/MTPseudoRandom.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MTPseudoRandom.h
rename to Code/Legacy/CryCommon/MTPseudoRandom.h
diff --git a/Code/CryEngine/CryCommon/MacSpecific.h b/Code/Legacy/CryCommon/MacSpecific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MacSpecific.h
rename to Code/Legacy/CryCommon/MacSpecific.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h
rename to Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceBus.h b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceBus.h
rename to Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceBus.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
rename to Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
rename to Code/Legacy/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/SequenceComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/SequenceComponentBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Bus/SequenceComponentBus.h
rename to Code/Legacy/CryCommon/Maestro/Bus/SequenceComponentBus.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimNodeType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/AnimNodeType.h
rename to Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimParamType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/AnimParamType.h
rename to Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimValue.h b/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/AnimValue.h
rename to Code/Legacy/CryCommon/Maestro/Types/AnimValue.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimValueType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/AnimValueType.h
rename to Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AssetBlendKey.h b/Code/Legacy/CryCommon/Maestro/Types/AssetBlendKey.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/AssetBlendKey.h
rename to Code/Legacy/CryCommon/Maestro/Types/AssetBlendKey.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AssetBlends.h b/Code/Legacy/CryCommon/Maestro/Types/AssetBlends.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/AssetBlends.h
rename to Code/Legacy/CryCommon/Maestro/Types/AssetBlends.h
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/SequenceType.h b/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Maestro/Types/SequenceType.h
rename to Code/Legacy/CryCommon/Maestro/Types/SequenceType.h
diff --git a/Code/CryEngine/CryCommon/MainThreadRenderRequestBus.h b/Code/Legacy/CryCommon/MainThreadRenderRequestBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MainThreadRenderRequestBus.h
rename to Code/Legacy/CryCommon/MainThreadRenderRequestBus.h
diff --git a/Code/CryEngine/CryCommon/MathConversion.h b/Code/Legacy/CryCommon/MathConversion.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MathConversion.h
rename to Code/Legacy/CryCommon/MathConversion.h
diff --git a/Code/CryEngine/CryCommon/MemoryAccess.h b/Code/Legacy/CryCommon/MemoryAccess.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MemoryAccess.h
rename to Code/Legacy/CryCommon/MemoryAccess.h
diff --git a/Code/CryEngine/CryCommon/MetaUtils.h b/Code/Legacy/CryCommon/MetaUtils.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MetaUtils.h
rename to Code/Legacy/CryCommon/MetaUtils.h
diff --git a/Code/CryEngine/CryCommon/MicrophoneBus.h b/Code/Legacy/CryCommon/MicrophoneBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MicrophoneBus.h
rename to Code/Legacy/CryCommon/MicrophoneBus.h
diff --git a/Code/CryEngine/CryCommon/MiniQueue.h b/Code/Legacy/CryCommon/MiniQueue.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MiniQueue.h
rename to Code/Legacy/CryCommon/MiniQueue.h
diff --git a/Code/CryEngine/CryCommon/Mocks/IAudioSystemMock.h b/Code/Legacy/CryCommon/Mocks/IAudioSystemMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/IAudioSystemMock.h
rename to Code/Legacy/CryCommon/Mocks/IAudioSystemMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/ICVarMock.h b/Code/Legacy/CryCommon/Mocks/ICVarMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/ICVarMock.h
rename to Code/Legacy/CryCommon/Mocks/ICVarMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/IConsoleMock.h b/Code/Legacy/CryCommon/Mocks/IConsoleMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/IConsoleMock.h
rename to Code/Legacy/CryCommon/Mocks/IConsoleMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/ICryPakMock.h b/Code/Legacy/CryCommon/Mocks/ICryPakMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/ICryPakMock.h
rename to Code/Legacy/CryCommon/Mocks/ICryPakMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/ILogMock.h b/Code/Legacy/CryCommon/Mocks/ILogMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/ILogMock.h
rename to Code/Legacy/CryCommon/Mocks/ILogMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/IRemoteConsoleMock.h b/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/IRemoteConsoleMock.h
rename to Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/IRendererMock.h b/Code/Legacy/CryCommon/Mocks/IRendererMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/IRendererMock.h
rename to Code/Legacy/CryCommon/Mocks/IRendererMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/ISystemMock.h b/Code/Legacy/CryCommon/Mocks/ISystemMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/ISystemMock.h
rename to Code/Legacy/CryCommon/Mocks/ISystemMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/ITextureMock.h b/Code/Legacy/CryCommon/Mocks/ITextureMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/ITextureMock.h
rename to Code/Legacy/CryCommon/Mocks/ITextureMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/ITimerMock.h b/Code/Legacy/CryCommon/Mocks/ITimerMock.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/ITimerMock.h
rename to Code/Legacy/CryCommon/Mocks/ITimerMock.h
diff --git a/Code/CryEngine/CryCommon/Mocks/StubTimer.h b/Code/Legacy/CryCommon/Mocks/StubTimer.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Mocks/StubTimer.h
rename to Code/Legacy/CryCommon/Mocks/StubTimer.h
diff --git a/Code/CryEngine/CryCommon/MultiThread.h b/Code/Legacy/CryCommon/MultiThread.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MultiThread.h
rename to Code/Legacy/CryCommon/MultiThread.h
diff --git a/Code/CryEngine/CryCommon/MultiThread_Containers.h b/Code/Legacy/CryCommon/MultiThread_Containers.h
similarity index 100%
rename from Code/CryEngine/CryCommon/MultiThread_Containers.h
rename to Code/Legacy/CryCommon/MultiThread_Containers.h
diff --git a/Code/CryEngine/CryCommon/NullAudioSystem.h b/Code/Legacy/CryCommon/NullAudioSystem.h
similarity index 100%
rename from Code/CryEngine/CryCommon/NullAudioSystem.h
rename to Code/Legacy/CryCommon/NullAudioSystem.h
diff --git a/Code/CryEngine/CryCommon/Options.h b/Code/Legacy/CryCommon/Options.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Options.h
rename to Code/Legacy/CryCommon/Options.h
diff --git a/Code/CryEngine/CryCommon/PNoise3.h b/Code/Legacy/CryCommon/PNoise3.h
similarity index 100%
rename from Code/CryEngine/CryCommon/PNoise3.h
rename to Code/Legacy/CryCommon/PNoise3.h
diff --git a/Code/CryEngine/CryCommon/PoolAllocator.h b/Code/Legacy/CryCommon/PoolAllocator.h
similarity index 100%
rename from Code/CryEngine/CryCommon/PoolAllocator.h
rename to Code/Legacy/CryCommon/PoolAllocator.h
diff --git a/Code/CryEngine/CryCommon/ProjectDefines.h b/Code/Legacy/CryCommon/ProjectDefines.h
similarity index 99%
rename from Code/CryEngine/CryCommon/ProjectDefines.h
rename to Code/Legacy/CryCommon/ProjectDefines.h
index 097191c039..8cf4c472e0 100644
--- a/Code/CryEngine/CryCommon/ProjectDefines.h
+++ b/Code/Legacy/CryCommon/ProjectDefines.h
@@ -60,7 +60,6 @@ typedef uint32 vtx_idx;
 #endif
 
 
-// see http://wiki/bin/view/CryEngine/TerrainTexCompression for more details on this
 // 0=off, 1=on
 #define TERRAIN_USE_CIE_COLORSPACE 0
 
diff --git a/Code/CryEngine/CryCommon/Random.h b/Code/Legacy/CryCommon/Random.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Random.h
rename to Code/Legacy/CryCommon/Random.h
diff --git a/Code/CryEngine/CryCommon/Range.h b/Code/Legacy/CryCommon/Range.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Range.h
rename to Code/Legacy/CryCommon/Range.h
diff --git a/Code/CryEngine/CryCommon/RenderBus.h b/Code/Legacy/CryCommon/RenderBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/RenderBus.h
rename to Code/Legacy/CryCommon/RenderBus.h
diff --git a/Code/CryEngine/CryCommon/SFunctor.h b/Code/Legacy/CryCommon/SFunctor.h
similarity index 100%
rename from Code/CryEngine/CryCommon/SFunctor.h
rename to Code/Legacy/CryCommon/SFunctor.h
diff --git a/Code/CryEngine/CryCommon/ScopedVariableSetter.h b/Code/Legacy/CryCommon/ScopedVariableSetter.h
similarity index 100%
rename from Code/CryEngine/CryCommon/ScopedVariableSetter.h
rename to Code/Legacy/CryCommon/ScopedVariableSetter.h
diff --git a/Code/CryEngine/CryCommon/SerializationTypes.h b/Code/Legacy/CryCommon/SerializationTypes.h
similarity index 100%
rename from Code/CryEngine/CryCommon/SerializationTypes.h
rename to Code/Legacy/CryCommon/SerializationTypes.h
diff --git a/Code/CryEngine/CryCommon/SerializeFwd.h b/Code/Legacy/CryCommon/SerializeFwd.h
similarity index 100%
rename from Code/CryEngine/CryCommon/SerializeFwd.h
rename to Code/Legacy/CryCommon/SerializeFwd.h
diff --git a/Code/CryEngine/CryCommon/SimpleSerialize.h b/Code/Legacy/CryCommon/SimpleSerialize.h
similarity index 100%
rename from Code/CryEngine/CryCommon/SimpleSerialize.h
rename to Code/Legacy/CryCommon/SimpleSerialize.h
diff --git a/Code/CryEngine/CryCommon/StatObjBus.h b/Code/Legacy/CryCommon/StatObjBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/StatObjBus.h
rename to Code/Legacy/CryCommon/StatObjBus.h
diff --git a/Code/CryEngine/CryCommon/StaticInstance.h b/Code/Legacy/CryCommon/StaticInstance.h
similarity index 100%
rename from Code/CryEngine/CryCommon/StaticInstance.h
rename to Code/Legacy/CryCommon/StaticInstance.h
diff --git a/Code/CryEngine/CryCommon/StereoRendererBus.h b/Code/Legacy/CryCommon/StereoRendererBus.h
similarity index 100%
rename from Code/CryEngine/CryCommon/StereoRendererBus.h
rename to Code/Legacy/CryCommon/StereoRendererBus.h
diff --git a/Code/CryEngine/CryCommon/StlUtils.h b/Code/Legacy/CryCommon/StlUtils.h
similarity index 100%
rename from Code/CryEngine/CryCommon/StlUtils.h
rename to Code/Legacy/CryCommon/StlUtils.h
diff --git a/Code/CryEngine/CryCommon/StringUtils.h b/Code/Legacy/CryCommon/StringUtils.h
similarity index 100%
rename from Code/CryEngine/CryCommon/StringUtils.h
rename to Code/Legacy/CryCommon/StringUtils.h
diff --git a/Code/CryEngine/CryCommon/Synchronization.h b/Code/Legacy/CryCommon/Synchronization.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Synchronization.h
rename to Code/Legacy/CryCommon/Synchronization.h
diff --git a/Code/CryEngine/CryCommon/Tarray.h b/Code/Legacy/CryCommon/Tarray.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Tarray.h
rename to Code/Legacy/CryCommon/Tarray.h
diff --git a/Code/CryEngine/CryCommon/TimeValue.h b/Code/Legacy/CryCommon/TimeValue.h
similarity index 100%
rename from Code/CryEngine/CryCommon/TimeValue.h
rename to Code/Legacy/CryCommon/TimeValue.h
diff --git a/Code/CryEngine/CryCommon/TimeValue_info.h b/Code/Legacy/CryCommon/TimeValue_info.h
similarity index 100%
rename from Code/CryEngine/CryCommon/TimeValue_info.h
rename to Code/Legacy/CryCommon/TimeValue_info.h
diff --git a/Code/CryEngine/CryCommon/Timer.h b/Code/Legacy/CryCommon/Timer.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Timer.h
rename to Code/Legacy/CryCommon/Timer.h
diff --git a/Code/CryEngine/CryCommon/TypeInfo_decl.h b/Code/Legacy/CryCommon/TypeInfo_decl.h
similarity index 100%
rename from Code/CryEngine/CryCommon/TypeInfo_decl.h
rename to Code/Legacy/CryCommon/TypeInfo_decl.h
diff --git a/Code/CryEngine/CryCommon/TypeInfo_impl.h b/Code/Legacy/CryCommon/TypeInfo_impl.h
similarity index 100%
rename from Code/CryEngine/CryCommon/TypeInfo_impl.h
rename to Code/Legacy/CryCommon/TypeInfo_impl.h
diff --git a/Code/CryEngine/CryCommon/UnicodeBinding.h b/Code/Legacy/CryCommon/UnicodeBinding.h
similarity index 100%
rename from Code/CryEngine/CryCommon/UnicodeBinding.h
rename to Code/Legacy/CryCommon/UnicodeBinding.h
diff --git a/Code/CryEngine/CryCommon/UnicodeEncoding.h b/Code/Legacy/CryCommon/UnicodeEncoding.h
similarity index 100%
rename from Code/CryEngine/CryCommon/UnicodeEncoding.h
rename to Code/Legacy/CryCommon/UnicodeEncoding.h
diff --git a/Code/CryEngine/CryCommon/UnicodeFunctions.h b/Code/Legacy/CryCommon/UnicodeFunctions.h
similarity index 100%
rename from Code/CryEngine/CryCommon/UnicodeFunctions.h
rename to Code/Legacy/CryCommon/UnicodeFunctions.h
diff --git a/Code/CryEngine/CryCommon/UnicodeIterator.h b/Code/Legacy/CryCommon/UnicodeIterator.h
similarity index 100%
rename from Code/CryEngine/CryCommon/UnicodeIterator.h
rename to Code/Legacy/CryCommon/UnicodeIterator.h
diff --git a/Code/CryEngine/CryCommon/VRCommon.h b/Code/Legacy/CryCommon/VRCommon.h
similarity index 100%
rename from Code/CryEngine/CryCommon/VRCommon.h
rename to Code/Legacy/CryCommon/VRCommon.h
diff --git a/Code/CryEngine/CryCommon/VectorMap.h b/Code/Legacy/CryCommon/VectorMap.h
similarity index 100%
rename from Code/CryEngine/CryCommon/VectorMap.h
rename to Code/Legacy/CryCommon/VectorMap.h
diff --git a/Code/CryEngine/CryCommon/VectorSet.h b/Code/Legacy/CryCommon/VectorSet.h
similarity index 100%
rename from Code/CryEngine/CryCommon/VectorSet.h
rename to Code/Legacy/CryCommon/VectorSet.h
diff --git a/Code/CryEngine/CryCommon/Vertex.h b/Code/Legacy/CryCommon/Vertex.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Vertex.h
rename to Code/Legacy/CryCommon/Vertex.h
diff --git a/Code/CryEngine/CryCommon/VertexFormats.h b/Code/Legacy/CryCommon/VertexFormats.h
similarity index 100%
rename from Code/CryEngine/CryCommon/VertexFormats.h
rename to Code/Legacy/CryCommon/VertexFormats.h
diff --git a/Code/CryEngine/CryCommon/Win32specific.h b/Code/Legacy/CryCommon/Win32specific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Win32specific.h
rename to Code/Legacy/CryCommon/Win32specific.h
diff --git a/Code/CryEngine/CryCommon/Win64specific.h b/Code/Legacy/CryCommon/Win64specific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/Win64specific.h
rename to Code/Legacy/CryCommon/Win64specific.h
diff --git a/Code/CryEngine/CryCommon/WinBase.cpp b/Code/Legacy/CryCommon/WinBase.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/WinBase.cpp
rename to Code/Legacy/CryCommon/WinBase.cpp
diff --git a/Code/CryEngine/CryCommon/XMLBinaryHeaders.h b/Code/Legacy/CryCommon/XMLBinaryHeaders.h
similarity index 100%
rename from Code/CryEngine/CryCommon/XMLBinaryHeaders.h
rename to Code/Legacy/CryCommon/XMLBinaryHeaders.h
diff --git a/Code/CryEngine/CryCommon/crycommon_files.cmake b/Code/Legacy/CryCommon/crycommon_files.cmake
similarity index 100%
rename from Code/CryEngine/CryCommon/crycommon_files.cmake
rename to Code/Legacy/CryCommon/crycommon_files.cmake
diff --git a/Code/CryEngine/CryCommon/crycommon_testing_files.cmake b/Code/Legacy/CryCommon/crycommon_testing_files.cmake
similarity index 100%
rename from Code/CryEngine/CryCommon/crycommon_testing_files.cmake
rename to Code/Legacy/CryCommon/crycommon_testing_files.cmake
diff --git a/Code/CryEngine/CryCommon/iOSSpecific.h b/Code/Legacy/CryCommon/iOSSpecific.h
similarity index 100%
rename from Code/CryEngine/CryCommon/iOSSpecific.h
rename to Code/Legacy/CryCommon/iOSSpecific.h
diff --git a/Code/CryEngine/CryCommon/physinterface.h b/Code/Legacy/CryCommon/physinterface.h
similarity index 100%
rename from Code/CryEngine/CryCommon/physinterface.h
rename to Code/Legacy/CryCommon/physinterface.h
diff --git a/Code/CryEngine/CryCommon/platform.h b/Code/Legacy/CryCommon/platform.h
similarity index 100%
rename from Code/CryEngine/CryCommon/platform.h
rename to Code/Legacy/CryCommon/platform.h
diff --git a/Code/CryEngine/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp
similarity index 100%
rename from Code/CryEngine/CryCommon/platform_impl.cpp
rename to Code/Legacy/CryCommon/platform_impl.cpp
diff --git a/Code/CryEngine/CryCommon/primitives.h b/Code/Legacy/CryCommon/primitives.h
similarity index 100%
rename from Code/CryEngine/CryCommon/primitives.h
rename to Code/Legacy/CryCommon/primitives.h
diff --git a/Code/CryEngine/CryCommon/smartptr.h b/Code/Legacy/CryCommon/smartptr.h
similarity index 100%
rename from Code/CryEngine/CryCommon/smartptr.h
rename to Code/Legacy/CryCommon/smartptr.h
diff --git a/Code/CryEngine/CryCommon/stridedptr.h b/Code/Legacy/CryCommon/stridedptr.h
similarity index 100%
rename from Code/CryEngine/CryCommon/stridedptr.h
rename to Code/Legacy/CryCommon/stridedptr.h
diff --git a/Code/CryEngine/CrySystem/AZCoreLogSink.h b/Code/Legacy/CrySystem/AZCoreLogSink.h
similarity index 100%
rename from Code/CryEngine/CrySystem/AZCoreLogSink.h
rename to Code/Legacy/CrySystem/AZCoreLogSink.h
diff --git a/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp b/Code/Legacy/CrySystem/AZCrySystemInitLogSink.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp
rename to Code/Legacy/CrySystem/AZCrySystemInitLogSink.cpp
diff --git a/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.h b/Code/Legacy/CrySystem/AZCrySystemInitLogSink.h
similarity index 100%
rename from Code/CryEngine/CrySystem/AZCrySystemInitLogSink.h
rename to Code/Legacy/CrySystem/AZCrySystemInitLogSink.h
diff --git a/Code/CryEngine/CrySystem/CMakeLists.txt b/Code/Legacy/CrySystem/CMakeLists.txt
similarity index 100%
rename from Code/CryEngine/CrySystem/CMakeLists.txt
rename to Code/Legacy/CrySystem/CMakeLists.txt
diff --git a/Code/CryEngine/CrySystem/CmdLine.cpp b/Code/Legacy/CrySystem/CmdLine.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/CmdLine.cpp
rename to Code/Legacy/CrySystem/CmdLine.cpp
diff --git a/Code/CryEngine/CrySystem/CmdLine.h b/Code/Legacy/CrySystem/CmdLine.h
similarity index 100%
rename from Code/CryEngine/CrySystem/CmdLine.h
rename to Code/Legacy/CrySystem/CmdLine.h
diff --git a/Code/CryEngine/CrySystem/CmdLineArg.cpp b/Code/Legacy/CrySystem/CmdLineArg.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/CmdLineArg.cpp
rename to Code/Legacy/CrySystem/CmdLineArg.cpp
diff --git a/Code/CryEngine/CrySystem/CmdLineArg.h b/Code/Legacy/CrySystem/CmdLineArg.h
similarity index 100%
rename from Code/CryEngine/CrySystem/CmdLineArg.h
rename to Code/Legacy/CrySystem/CmdLineArg.h
diff --git a/Code/CryEngine/CrySystem/ConsoleBatchFile.cpp b/Code/Legacy/CrySystem/ConsoleBatchFile.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/ConsoleBatchFile.cpp
rename to Code/Legacy/CrySystem/ConsoleBatchFile.cpp
diff --git a/Code/CryEngine/CrySystem/ConsoleBatchFile.h b/Code/Legacy/CrySystem/ConsoleBatchFile.h
similarity index 100%
rename from Code/CryEngine/CrySystem/ConsoleBatchFile.h
rename to Code/Legacy/CrySystem/ConsoleBatchFile.h
diff --git a/Code/CryEngine/CrySystem/ConsoleHelpGen.cpp b/Code/Legacy/CrySystem/ConsoleHelpGen.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/ConsoleHelpGen.cpp
rename to Code/Legacy/CrySystem/ConsoleHelpGen.cpp
diff --git a/Code/CryEngine/CrySystem/ConsoleHelpGen.h b/Code/Legacy/CrySystem/ConsoleHelpGen.h
similarity index 100%
rename from Code/CryEngine/CrySystem/ConsoleHelpGen.h
rename to Code/Legacy/CrySystem/ConsoleHelpGen.h
diff --git a/Code/CryEngine/CrySystem/CrySystem_precompiled.h b/Code/Legacy/CrySystem/CrySystem_precompiled.h
similarity index 100%
rename from Code/CryEngine/CrySystem/CrySystem_precompiled.h
rename to Code/Legacy/CrySystem/CrySystem_precompiled.h
diff --git a/Code/CryEngine/CrySystem/DebugCallStack.cpp b/Code/Legacy/CrySystem/DebugCallStack.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/DebugCallStack.cpp
rename to Code/Legacy/CrySystem/DebugCallStack.cpp
diff --git a/Code/CryEngine/CrySystem/DebugCallStack.h b/Code/Legacy/CrySystem/DebugCallStack.h
similarity index 100%
rename from Code/CryEngine/CrySystem/DebugCallStack.h
rename to Code/Legacy/CrySystem/DebugCallStack.h
diff --git a/Code/CryEngine/CrySystem/DllMain.cpp b/Code/Legacy/CrySystem/DllMain.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/DllMain.cpp
rename to Code/Legacy/CrySystem/DllMain.cpp
diff --git a/Code/CryEngine/CrySystem/Huffman.cpp b/Code/Legacy/CrySystem/Huffman.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/Huffman.cpp
rename to Code/Legacy/CrySystem/Huffman.cpp
diff --git a/Code/CryEngine/CrySystem/Huffman.h b/Code/Legacy/CrySystem/Huffman.h
similarity index 100%
rename from Code/CryEngine/CrySystem/Huffman.h
rename to Code/Legacy/CrySystem/Huffman.h
diff --git a/Code/CryEngine/CrySystem/IDebugCallStack.cpp b/Code/Legacy/CrySystem/IDebugCallStack.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/IDebugCallStack.cpp
rename to Code/Legacy/CrySystem/IDebugCallStack.cpp
diff --git a/Code/CryEngine/CrySystem/IDebugCallStack.h b/Code/Legacy/CrySystem/IDebugCallStack.h
similarity index 100%
rename from Code/CryEngine/CrySystem/IDebugCallStack.h
rename to Code/Legacy/CrySystem/IDebugCallStack.h
diff --git a/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
rename to Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
diff --git a/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.h b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
similarity index 100%
rename from Code/CryEngine/CrySystem/LevelSystem/LevelSystem.h
rename to Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
diff --git a/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
rename to Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
diff --git a/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.h b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
similarity index 100%
rename from Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.h
rename to Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
diff --git a/Code/CryEngine/CrySystem/LocalizedStringManager.cpp b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/LocalizedStringManager.cpp
rename to Code/Legacy/CrySystem/LocalizedStringManager.cpp
diff --git a/Code/CryEngine/CrySystem/LocalizedStringManager.h b/Code/Legacy/CrySystem/LocalizedStringManager.h
similarity index 100%
rename from Code/CryEngine/CrySystem/LocalizedStringManager.h
rename to Code/Legacy/CrySystem/LocalizedStringManager.h
diff --git a/Code/CryEngine/CrySystem/Log.cpp b/Code/Legacy/CrySystem/Log.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/Log.cpp
rename to Code/Legacy/CrySystem/Log.cpp
diff --git a/Code/CryEngine/CrySystem/Log.h b/Code/Legacy/CrySystem/Log.h
similarity index 100%
rename from Code/CryEngine/CrySystem/Log.h
rename to Code/Legacy/CrySystem/Log.h
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.cpp b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.cpp
rename to Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.cpp
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.h b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.h
similarity index 100%
rename from Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.h
rename to Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.h
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_impl.inl
similarity index 100%
rename from Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl
rename to Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_impl.inl
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_none.inl b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_none.inl
similarity index 100%
rename from Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_none.inl
rename to Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_none.inl
diff --git a/Code/CryEngine/CrySystem/SimpleStringPool.h b/Code/Legacy/CrySystem/SimpleStringPool.h
similarity index 100%
rename from Code/CryEngine/CrySystem/SimpleStringPool.h
rename to Code/Legacy/CrySystem/SimpleStringPool.h
diff --git a/Code/CryEngine/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/System.cpp
rename to Code/Legacy/CrySystem/System.cpp
diff --git a/Code/CryEngine/CrySystem/System.h b/Code/Legacy/CrySystem/System.h
similarity index 100%
rename from Code/CryEngine/CrySystem/System.h
rename to Code/Legacy/CrySystem/System.h
diff --git a/Code/CryEngine/CrySystem/SystemCFG.cpp b/Code/Legacy/CrySystem/SystemCFG.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/SystemCFG.cpp
rename to Code/Legacy/CrySystem/SystemCFG.cpp
diff --git a/Code/CryEngine/CrySystem/SystemCFG.h b/Code/Legacy/CrySystem/SystemCFG.h
similarity index 100%
rename from Code/CryEngine/CrySystem/SystemCFG.h
rename to Code/Legacy/CrySystem/SystemCFG.h
diff --git a/Code/CryEngine/CrySystem/SystemEventDispatcher.cpp b/Code/Legacy/CrySystem/SystemEventDispatcher.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/SystemEventDispatcher.cpp
rename to Code/Legacy/CrySystem/SystemEventDispatcher.cpp
diff --git a/Code/CryEngine/CrySystem/SystemEventDispatcher.h b/Code/Legacy/CrySystem/SystemEventDispatcher.h
similarity index 100%
rename from Code/CryEngine/CrySystem/SystemEventDispatcher.h
rename to Code/Legacy/CrySystem/SystemEventDispatcher.h
diff --git a/Code/CryEngine/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/SystemInit.cpp
rename to Code/Legacy/CrySystem/SystemInit.cpp
diff --git a/Code/CryEngine/CrySystem/SystemWin32.cpp b/Code/Legacy/CrySystem/SystemWin32.cpp
similarity index 99%
rename from Code/CryEngine/CrySystem/SystemWin32.cpp
rename to Code/Legacy/CrySystem/SystemWin32.cpp
index 531c927095..3dbac48321 100644
--- a/Code/CryEngine/CrySystem/SystemWin32.cpp
+++ b/Code/Legacy/CrySystem/SystemWin32.cpp
@@ -67,8 +67,7 @@ __pragma(comment(lib, "Winmm.lib"))
 const char g_szGroupCore[] = "CryEngine";
 const char* g_szModuleGroups[][2] = {
     {"Editor.exe", g_szGroupCore},
-    {"CrySystem.dll", g_szGroupCore},
-    {"CryFont.dll", g_szGroupCore},
+    {"CrySystem.dll", g_szGroupCore}
 };
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/CrySystem/Timer.cpp b/Code/Legacy/CrySystem/Timer.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/Timer.cpp
rename to Code/Legacy/CrySystem/Timer.cpp
diff --git a/Code/CryEngine/CrySystem/Timer.h b/Code/Legacy/CrySystem/Timer.h
similarity index 100%
rename from Code/CryEngine/CrySystem/Timer.h
rename to Code/Legacy/CrySystem/Timer.h
diff --git a/Code/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp b/Code/Legacy/CrySystem/ViewSystem/DebugCamera.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp
rename to Code/Legacy/CrySystem/ViewSystem/DebugCamera.cpp
diff --git a/Code/CryEngine/CrySystem/ViewSystem/DebugCamera.h b/Code/Legacy/CrySystem/ViewSystem/DebugCamera.h
similarity index 100%
rename from Code/CryEngine/CrySystem/ViewSystem/DebugCamera.h
rename to Code/Legacy/CrySystem/ViewSystem/DebugCamera.h
diff --git a/Code/CryEngine/CrySystem/ViewSystem/View.cpp b/Code/Legacy/CrySystem/ViewSystem/View.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/ViewSystem/View.cpp
rename to Code/Legacy/CrySystem/ViewSystem/View.cpp
diff --git a/Code/CryEngine/CrySystem/ViewSystem/View.h b/Code/Legacy/CrySystem/ViewSystem/View.h
similarity index 100%
rename from Code/CryEngine/CrySystem/ViewSystem/View.h
rename to Code/Legacy/CrySystem/ViewSystem/View.h
diff --git a/Code/CryEngine/CrySystem/ViewSystem/ViewSystem.cpp b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/ViewSystem/ViewSystem.cpp
rename to Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
diff --git a/Code/CryEngine/CrySystem/ViewSystem/ViewSystem.h b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.h
similarity index 100%
rename from Code/CryEngine/CrySystem/ViewSystem/ViewSystem.h
rename to Code/Legacy/CrySystem/ViewSystem/ViewSystem.h
diff --git a/Code/CryEngine/CrySystem/WindowsErrorReporting.cpp b/Code/Legacy/CrySystem/WindowsErrorReporting.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/WindowsErrorReporting.cpp
rename to Code/Legacy/CrySystem/WindowsErrorReporting.cpp
diff --git a/Code/CryEngine/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XConsole.cpp
rename to Code/Legacy/CrySystem/XConsole.cpp
diff --git a/Code/CryEngine/CrySystem/XConsole.h b/Code/Legacy/CrySystem/XConsole.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XConsole.h
rename to Code/Legacy/CrySystem/XConsole.h
diff --git a/Code/CryEngine/CrySystem/XConsoleVariable.cpp b/Code/Legacy/CrySystem/XConsoleVariable.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XConsoleVariable.cpp
rename to Code/Legacy/CrySystem/XConsoleVariable.cpp
diff --git a/Code/CryEngine/CrySystem/XConsoleVariable.h b/Code/Legacy/CrySystem/XConsoleVariable.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XConsoleVariable.h
rename to Code/Legacy/CrySystem/XConsoleVariable.h
diff --git a/Code/CryEngine/CrySystem/XML/CMakeLists.txt b/Code/Legacy/CrySystem/XML/CMakeLists.txt
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/CMakeLists.txt
rename to Code/Legacy/CrySystem/XML/CMakeLists.txt
diff --git a/Code/CryEngine/CrySystem/XML/Expat/COPYING.txt b/Code/Legacy/CrySystem/XML/Expat/COPYING.txt
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/Expat/COPYING.txt
rename to Code/Legacy/CrySystem/XML/Expat/COPYING.txt
diff --git a/Code/CryEngine/CrySystem/XML/ReadWriteXMLSink.h b/Code/Legacy/CrySystem/XML/ReadWriteXMLSink.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/ReadWriteXMLSink.h
rename to Code/Legacy/CrySystem/XML/ReadWriteXMLSink.h
diff --git a/Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp b/Code/Legacy/CrySystem/XML/ReadXMLSink.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp
rename to Code/Legacy/CrySystem/XML/ReadXMLSink.cpp
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLReader.cpp b/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/SerializeXMLReader.cpp
rename to Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLReader.h b/Code/Legacy/CrySystem/XML/SerializeXMLReader.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/SerializeXMLReader.h
rename to Code/Legacy/CrySystem/XML/SerializeXMLReader.h
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.cpp b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/SerializeXMLWriter.cpp
rename to Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.h b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/SerializeXMLWriter.h
rename to Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
diff --git a/Code/CryEngine/CrySystem/XML/WriteXMLSource.cpp b/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/WriteXMLSource.cpp
rename to Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryNode.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLBinaryNode.cpp
rename to Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryNode.h b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLBinaryNode.h
rename to Code/Legacy/CrySystem/XML/XMLBinaryNode.h
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryReader.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryReader.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLBinaryReader.cpp
rename to Code/Legacy/CrySystem/XML/XMLBinaryReader.cpp
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryReader.h b/Code/Legacy/CrySystem/XML/XMLBinaryReader.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLBinaryReader.h
rename to Code/Legacy/CrySystem/XML/XMLBinaryReader.h
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLBinaryWriter.cpp
rename to Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.h b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLBinaryWriter.h
rename to Code/Legacy/CrySystem/XML/XMLBinaryWriter.h
diff --git a/Code/CryEngine/CrySystem/XML/XMLPatcher.cpp b/Code/Legacy/CrySystem/XML/XMLPatcher.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLPatcher.cpp
rename to Code/Legacy/CrySystem/XML/XMLPatcher.cpp
diff --git a/Code/CryEngine/CrySystem/XML/XMLPatcher.h b/Code/Legacy/CrySystem/XML/XMLPatcher.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XMLPatcher.h
rename to Code/Legacy/CrySystem/XML/XMLPatcher.h
diff --git a/Code/CryEngine/CrySystem/XML/XmlUtils.cpp b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XmlUtils.cpp
rename to Code/Legacy/CrySystem/XML/XmlUtils.cpp
diff --git a/Code/CryEngine/CrySystem/XML/XmlUtils.h b/Code/Legacy/CrySystem/XML/XmlUtils.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/XmlUtils.h
rename to Code/Legacy/CrySystem/XML/XmlUtils.h
diff --git a/Code/CryEngine/CrySystem/XML/crysystem_xmlbinary_files.cmake b/Code/Legacy/CrySystem/XML/crysystem_xmlbinary_files.cmake
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/crysystem_xmlbinary_files.cmake
rename to Code/Legacy/CrySystem/XML/crysystem_xmlbinary_files.cmake
diff --git a/Code/CryEngine/CrySystem/XML/xml.cpp b/Code/Legacy/CrySystem/XML/xml.cpp
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/xml.cpp
rename to Code/Legacy/CrySystem/XML/xml.cpp
diff --git a/Code/CryEngine/CrySystem/XML/xml.h b/Code/Legacy/CrySystem/XML/xml.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/xml.h
rename to Code/Legacy/CrySystem/XML/xml.h
diff --git a/Code/CryEngine/CrySystem/XML/xml_string.h b/Code/Legacy/CrySystem/XML/xml_string.h
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/xml_string.h
rename to Code/Legacy/CrySystem/XML/xml_string.h
diff --git a/Code/CryEngine/CrySystem/crysystem_files.cmake b/Code/Legacy/CrySystem/crysystem_files.cmake
similarity index 100%
rename from Code/CryEngine/CrySystem/crysystem_files.cmake
rename to Code/Legacy/CrySystem/crysystem_files.cmake
diff --git a/Code/CryEngine/CrySystem/crysystem_shared_files.cmake b/Code/Legacy/CrySystem/crysystem_shared_files.cmake
similarity index 100%
rename from Code/CryEngine/CrySystem/crysystem_shared_files.cmake
rename to Code/Legacy/CrySystem/crysystem_shared_files.cmake
diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Sandbox/Editor/editor_lib_files.cmake
index 32073cac2a..15e2bc6478 100644
--- a/Code/Sandbox/Editor/editor_lib_files.cmake
+++ b/Code/Sandbox/Editor/editor_lib_files.cmake
@@ -229,7 +229,7 @@ set(FILES
     res/warning16x16.ico
     res/water.bmp
     res/work_in_progress_icon.ico
-    res/CryEngineLogo.bmp
+    res/LegacyLogo.bmp
     res/MannFileManagerImageList.bmp
     res/infobar/CameraCollision-default.svg
     res/infobar/GotoLocation-default.svg
diff --git a/Code/Sandbox/Editor/res/CryEngineLogo.bmp b/Code/Sandbox/Editor/res/LegacyLogo.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEngineLogo.bmp
rename to Code/Sandbox/Editor/res/LegacyLogo.bmp
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
index c055f9f3ca..ddb8100821 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
@@ -170,7 +170,8 @@
    <addaction name="menuEdit"/>
    <addaction name="menuView_2"/>
    <addaction name="menuTools_2"/>
-   <addaction name="menuUtilities"/>
+    <!-- Disabled until tool is stabilized <widget class="QMenu" name="menuUtilities">
+   <addaction name="menuUtilities"/> -->
    <addaction name="menuSettings_2"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h
index d1085597b1..04149d5a8d 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h
@@ -27,7 +27,7 @@ namespace Camera
     public:
         ~OffsetPosition() override = default;
         AZ_RTTI(OffsetPosition, "{5B2975A6-839B-4DE0-842B-EDE78D778BC9}", ICameraLookAtBehavior);
-        AZ_CLASS_ALLOCATOR(OffsetPosition, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(OffsetPosition, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h
index 7bc6be4144..8e7abd5f32 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h
@@ -29,7 +29,7 @@ namespace Camera
     public:
         ~RotateCameraLookAt() override = default;
         AZ_RTTI(RotateCameraLookAt, "{B72C5BE7-2DAF-412B-BBBB-F216B3DFB9A0}", ICameraLookAtBehavior);
-        AZ_CLASS_ALLOCATOR(RotateCameraLookAt, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(RotateCameraLookAt, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
index ade6582a67..8f685faf6d 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
@@ -28,7 +28,7 @@ namespace Camera
     public:
         ~SlideAlongAxisBasedOnAngle() override = default;
         AZ_RTTI(SlideAlongAxisBasedOnAngle, "{8DDA8D0B-5BC3-437E-894B-5144E6E81236}", ICameraLookAtBehavior);
-        AZ_CLASS_ALLOCATOR(SlideAlongAxisBasedOnAngle, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(SlideAlongAxisBasedOnAngle, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h
index 96bf90eaff..e9171e0ce4 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h
@@ -28,7 +28,7 @@ namespace Camera
     public:
         ~AcquireByEntityId() override = default;
         AZ_RTTI(AcquireByEntityId, "{14D0D355-1F83-4F46-9DE1-D41D23BDFC3C}", ICameraTargetAcquirer)
-        AZ_CLASS_ALLOCATOR(AcquireByEntityId, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(AcquireByEntityId, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h
index ac7d571715..15dc05c230 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h
@@ -29,7 +29,7 @@ namespace Camera
     public:
         ~AcquireByTag() override = default;
         AZ_RTTI(AcquireByTag, "{E76621A5-E5A8-41B0-AC1D-EC87553181F5}", ICameraTargetAcquirer)
-        AZ_CLASS_ALLOCATOR(AcquireByTag, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(AcquireByTag, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h
index 2ccd77fbe6..4052d44ec9 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h
@@ -26,7 +26,7 @@ namespace Camera
     public:
         ~FaceTarget() override = default;
         AZ_RTTI(FaceTarget, "{1A2CBCD0-1841-493C-8DB7-1BCA0D293019}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(FaceTarget, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(FaceTarget, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h
index 4a52b3787d..076a63edfb 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h
@@ -23,7 +23,7 @@ namespace Camera
     public:
         ~FollowTargetFromAngle() override = default;
         AZ_RTTI(FollowTargetFromAngle, "{4DBE7A2C-8E93-422E-8942-9601A270D37E}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(FollowTargetFromAngle, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(FollowTargetFromAngle, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h
index d27c9cd12e..78e43df0cf 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h
@@ -30,7 +30,7 @@ namespace Camera
     public:
         ~FollowTargetFromDistance() override = default;
         AZ_RTTI(FollowTargetFromDistance, "{E6BEDB2C-6812-4369-8C0F-C1E72F380E50}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(FollowTargetFromDistance, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(FollowTargetFromDistance, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h
index 7d1dfb740c..e590d8c2eb 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h
@@ -21,7 +21,7 @@ namespace Camera
     public:
         ~OffsetCameraPosition() override = default;
         AZ_RTTI(OffsetCameraPosition, "{DB64D5DA-84B7-45B7-B221-B5A07BDA2F69}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(OffsetCameraPosition, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(OffsetCameraPosition, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h
index 1d75d8894c..d5af0ac9d3 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h
@@ -22,7 +22,7 @@ namespace Camera
     public:
         ~Rotate() override = default;
         AZ_RTTI(Rotate, "{EE06111E-75E8-47F0-B243-5A5308A5F605}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(Rotate, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(Rotate, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Templates/DefaultProject/Template/Resources/CryEngineLogoLauncher.bmp b/Templates/DefaultProject/Template/Resources/LegacyLogoLauncher.bmp
similarity index 100%
rename from Templates/DefaultProject/Template/Resources/CryEngineLogoLauncher.bmp
rename to Templates/DefaultProject/Template/Resources/LegacyLogoLauncher.bmp
diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json
index 67df3cccf7..98cf0fc815 100644
--- a/Templates/DefaultProject/template.json
+++ b/Templates/DefaultProject/template.json
@@ -248,8 +248,8 @@
             "isOptional": false
         },
         {
-            "file": "Resources/CryEngineLogoLauncher.bmp",
-            "origin": "Resources/CryEngineLogoLauncher.bmp",
+            "file": "Resources/LegacyLogoLauncher.bmp",
+            "origin": "Resources/LegacyLogoLauncher.bmp",
             "isTemplated": false,
             "isOptional": false
         },
diff --git a/Templates/MinimalProject/Template/Resources/CryEngineLogoLauncher.bmp b/Templates/MinimalProject/Template/Resources/LegacyLogoLauncher.bmp
similarity index 100%
rename from Templates/MinimalProject/Template/Resources/CryEngineLogoLauncher.bmp
rename to Templates/MinimalProject/Template/Resources/LegacyLogoLauncher.bmp
diff --git a/Templates/MinimalProject/template.json b/Templates/MinimalProject/template.json
index 88214b26fa..18b10e8cae 100644
--- a/Templates/MinimalProject/template.json
+++ b/Templates/MinimalProject/template.json
@@ -245,8 +245,8 @@
             "isOptional": false
         },
         {
-            "file": "Resources/CryEngineLogoLauncher.bmp",
-            "origin": "Resources/CryEngineLogoLauncher.bmp",
+            "file": "Resources/LegacyLogoLauncher.bmp",
+            "origin": "Resources/LegacyLogoLauncher.bmp",
             "isTemplated": false,
             "isOptional": false
         },
diff --git a/scripts/build/package/Platform/Windows/package_filelists/atom.json b/scripts/build/package/Platform/Windows/package_filelists/atom.json
index e18e191882..3bd02de7e3 100644
--- a/scripts/build/package/Platform/Windows/package_filelists/atom.json
+++ b/scripts/build/package/Platform/Windows/package_filelists/atom.json
@@ -26,7 +26,7 @@
         },
         "cmake/**": "#include",
         "Code": {
-            "CryEngine/**": "#include",
+            "Legacy/**": "#include",
             "Framework/**": "#include",
             "LauncherUnified/**": "#include",
             "Sandbox/**": "#include",
diff --git a/scripts/commit_validation/commit_validation/pal_allowedlist.txt b/scripts/commit_validation/commit_validation/pal_allowedlist.txt
index e3bf4be52e..7c989e6f10 100644
--- a/scripts/commit_validation/commit_validation/pal_allowedlist.txt
+++ b/scripts/commit_validation/commit_validation/pal_allowedlist.txt
@@ -1,4 +1,4 @@
-*/Code/CryEngine/*
+*/Code/Legacy/*
 */Code/Deprecated/Sandbox/*
 */Code/Framework/AzCore/AzCore/Math/Aabb.h
 */Code/Framework/AzCore/AzCore/Math/Color.h
diff --git a/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py b/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py
index fc700fa9b9..88ca9a8592 100755
--- a/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py
@@ -21,8 +21,8 @@ EXCLUDED_COPYRIGHT_VALIDATION_PATTERNS = [
     '*/Code/Framework/AzCore/AzCore/std/string/utf8/core.h',                            # Copyright 2006 Nemanja Trifunovic
     '*/Code/Framework/AzCore/AzCore/std/string/utf8/unchecked.h',                       # Copyright 2006 Nemanja Trifunovic
     '*/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ltc.azsli',   # Copyright (c) 2017, Eric Heitz, Jonathan Dupuy, Stephen Hill and David Neubelt.
-    '*/Code/CryEngine/CryCommon/MTPseudoRandom.h',                                      # Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
-    '*/Code/CryEngine/CryCommon/PNoise3.h',                                             # Copyright(c) Ken Perlin
+    '*/Code/Legacy/CryCommon/MTPseudoRandom.h',                                         # Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
+    '*/Code/Legacy/CryCommon/PNoise3.h',                                                # Copyright(c) Ken Perlin
     '*/Code/Framework/AzQtComponents/AzQtComponents/Components/FlowLayout.*'            # Copyright (C) 2015 The Qt Company Ltd.
 ] + EXCLUDED_VALIDATION_PATTERNS