diff --git a/CMakeLists.txt b/CMakeLists.txt
index 970b8b8e22..6e5f943493 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -745,8 +745,8 @@ enable_cppcheck(
         # but cppcheck doesn't understand that as it assumes everything
         # will be compiled together in one binary.
         ctuOneDefinitionRuleViolation:*test/*
-        ctuOneDefinitionRuleViolation:*src/composable_kernel/composable_kernel/*/*
-        ctuOneDefinitionRuleViolation:*src/composable_kernel/host/*/*
+        ctuOneDefinitionRuleViolation:*src/legacy_composable_kernel/composable_kernel/*/*
+        ctuOneDefinitionRuleViolation:*src/legacy_composable_kernel/host/*/*
         # There are many FPs with this, let's disable this (ditto in MIGraphX)
         ctuPointerArith:*test/*
         duplicateCondition
@@ -767,13 +767,13 @@ enable_cppcheck(
         unreadVariable:*src/kernels/static_composable_kernel/*/*
         unusedScopedObject:*src/kernels/static_composable_kernel/*/*
         wrongPrintfScanfArgNum:*src/kernels/static_composable_kernel/*/*
-        knownConditionTrueFalse:*src/composable_kernel/composable_kernel/*/*
-        identicalConditionAfterEarlyExit:*src/composable_kernel/composable_kernel/*/*
-        duplicateExpression:*src/composable_kernel/composable_kernel/*/*
-        multiCondition:*src/composable_kernel/composable_kernel/*/*
-        unreadVariable:*src/composable_kernel/composable_kernel/*/*
-        unreadVariable:*src/composable_kernel/host/*/*
-        unreadVariable:*src/composable_kernel/external/*/*
+        knownConditionTrueFalse:*src/legacy_composable_kernel/composable_kernel/*/*
+        identicalConditionAfterEarlyExit:*src/legacy_composable_kernel/composable_kernel/*/*
+        duplicateExpression:*src/legacy_composable_kernel/composable_kernel/*/*
+        multiCondition:*src/legacy_composable_kernel/composable_kernel/*/*
+        unreadVariable:*src/legacy_composable_kernel/composable_kernel/*/*
+        unreadVariable:*src/legacy_composable_kernel/host/*/*
+        unreadVariable:*src/legacy_composable_kernel/external/*/*
         unmatchedSuppression
         ###################################################################
         # TODO Code Quality WORKAROUND ROCm 5.3 &&
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 74d80b8e2a..a8da7be9de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -371,8 +371,8 @@ endif()
 if( MIOPEN_BACKEND MATCHES "OpenCL" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN_BACKEND STREQUAL "HIP" OR MIOPEN_BACKEND STREQUAL "HIPNOGPU")
     file(GLOB_RECURSE STATIC_COMPOSABLE_KERNEL_INCLUDE "kernels/static_composable_kernel/include/*/*.hpp")
     file(GLOB_RECURSE STATIC_COMPOSABLE_KERNEL_SOURCE "kernels/static_composable_kernel/src/*/*.cpp")
-    file(GLOB_RECURSE COMPOSABLE_KERNEL_INCLUDE "composable_kernel/composable_kernel/include/*.hpp")
-    file(GLOB_RECURSE COMPOSABLE_KERNEL_SOURCE "composable_kernel/composable_kernel/src/*.cpp")
+    file(GLOB_RECURSE COMPOSABLE_KERNEL_INCLUDE "legacy_composable_kernel/composable_kernel/include/*.hpp")
+    file(GLOB_RECURSE COMPOSABLE_KERNEL_SOURCE "legacy_composable_kernel/composable_kernel/src/*.cpp")
     file(GLOB_RECURSE COMPOSABLE_KERNEL_DYNAMIC_ASM_SOURCE "kernels/dynamic_igemm/*.s")
     file(GLOB_RECURSE COMPOSABLE_KERNEL_DYNAMIC_ASM_INCLUDE "kernels/dynamic_igemm/*.inc")
     file(GLOB_RECURSE COMPOSABLE_KERNEL_DYNAMIC_CPP_SOURCE "kernels/dynamic_igemm/*.cpp")
diff --git a/src/include/miopen/solver/implicitgemm_legacy_ck_util.hpp b/src/include/miopen/solver/implicitgemm_legacy_ck_util.hpp
index 8f515c2bf9..d82f0ca2c3 100644
--- a/src/include/miopen/solver/implicitgemm_legacy_ck_util.hpp
+++ b/src/include/miopen/solver/implicitgemm_legacy_ck_util.hpp
@@ -28,8 +28,8 @@
 
 #include <miopen/solver/problem_description_interpreter.hpp>
 
-#include "../composable_kernel/composable_kernel/include/utility/data_type_enum.hpp"
-#include "../composable_kernel/host/solver/include/convolution_problem_descriptor.hpp"
+#include "../legacy_composable_kernel/composable_kernel/include/utility/data_type_enum.hpp"
+#include "../legacy_composable_kernel/host/solver/include/convolution_problem_descriptor.hpp"
 
 namespace miopen {
 namespace solver {
diff --git a/src/composable_kernel/composable_kernel/include/problem_transform/transform_forward_convolution_into_gemm_v6r1_nchw_kcyx_nkhw.hpp b/src/legacy_composable_kernel/composable_kernel/include/problem_transform/transform_forward_convolution_into_gemm_v6r1_nchw_kcyx_nkhw.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/problem_transform/transform_forward_convolution_into_gemm_v6r1_nchw_kcyx_nkhw.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/problem_transform/transform_forward_convolution_into_gemm_v6r1_nchw_kcyx_nkhw.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_description/cluster_descriptor.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_description/cluster_descriptor.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_description/cluster_descriptor.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_description/cluster_descriptor.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_description/multi_index_transform.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_description/multi_index_transform.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_description/multi_index_transform.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_description/multi_index_transform.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_description/multi_index_transform_helper.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_description/multi_index_transform_helper.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_description/multi_index_transform_helper.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_description/multi_index_transform_helper.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_description/tensor_adaptor.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_description/tensor_adaptor.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_description/tensor_adaptor.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_description/tensor_adaptor.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor_helper.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor_helper.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor_helper.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_description/tensor_descriptor_helper.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r2.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r2.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r2.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r2.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r3.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r3.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r3.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v2r3.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v3.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v3.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v3.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_dlops_v3.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_xdlops.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_xdlops.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_xdlops.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_gemm_xdlops.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer_v2.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer_v2.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer_v2.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/blockwise_tensor_slice_transfer_v2.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_contraction_dlops_v1r2.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_contraction_dlops_v1r2.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_contraction_dlops_v1r2.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_contraction_dlops_v1r2.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_blockwise.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_blockwise.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_blockwise.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_blockwise.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_threadwise.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_threadwise.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_threadwise.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_threadwise.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_warpwise.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_warpwise.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_warpwise.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_direct_warpwise.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_multiblock.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_multiblock.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_multiblock.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/gridwise_generic_2d_reduction_multiblock.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_blockwise.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_blockwise.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_blockwise.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_blockwise.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_threadwise.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_threadwise.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_threadwise.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_threadwise.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_warpwise.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_warpwise.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_warpwise.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/reduction_functions_warpwise.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_contraction_dlops.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_contraction_dlops.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_contraction_dlops.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_contraction_dlops.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_gemm_dlops_v3.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_gemm_dlops_v3.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_gemm_dlops_v3.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_gemm_dlops_v3.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_set.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_set.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_set.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_set.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer_v2.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer_v2.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer_v2.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/threadwise_tensor_slice_transfer_v2.hpp
diff --git a/src/composable_kernel/composable_kernel/include/tensor_operation/xdlops_gemm.hpp b/src/legacy_composable_kernel/composable_kernel/include/tensor_operation/xdlops_gemm.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/tensor_operation/xdlops_gemm.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/tensor_operation/xdlops_gemm.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/amd_address_space.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/amd_address_space.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/amd_address_space.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/amd_address_space.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/amd_buffer_addressing.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/amd_buffer_addressing.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/amd_buffer_addressing.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/amd_buffer_addressing.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/amd_inline_asm.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/amd_inline_asm.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/amd_inline_asm.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/amd_inline_asm.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/amd_xdlops.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/amd_xdlops.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/amd_xdlops.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/amd_xdlops.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/array.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/array.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/array.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/array.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/array_multi_index.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/array_multi_index.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/array_multi_index.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/array_multi_index.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/c_style_pointer_cast.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/c_style_pointer_cast.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/c_style_pointer_cast.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/c_style_pointer_cast.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/common_header.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/common_header.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/common_header.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/common_header.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/config.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/config.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/config.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/config.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/container_helper.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/container_helper.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/container_helper.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/container_helper.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/data_type.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/data_type.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/data_type.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/data_type.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/data_type_enum.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/data_type_enum.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/data_type_enum.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/data_type_enum.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/data_type_enum_helper.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/data_type_enum_helper.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/data_type_enum_helper.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/data_type_enum_helper.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/dynamic_buffer.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/dynamic_buffer.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/dynamic_buffer.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/dynamic_buffer.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/enable_if.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/enable_if.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/enable_if.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/enable_if.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/functional.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/functional.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/functional.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/functional.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/functional2.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/functional2.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/functional2.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/functional2.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/functional3.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/functional3.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/functional3.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/functional3.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/functional4.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/functional4.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/functional4.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/functional4.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/inner_product.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/inner_product.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/inner_product.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/inner_product.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/integral_constant.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/integral_constant.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/integral_constant.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/integral_constant.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/magic_division.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/magic_division.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/magic_division.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/magic_division.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/math.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/math.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/math.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/math.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/multi_index.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/multi_index.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/multi_index.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/multi_index.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/number.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/number.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/number.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/number.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/reduction_common.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/reduction_common.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/reduction_common.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/reduction_common.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/reduction_enums.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/reduction_enums.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/reduction_enums.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/reduction_enums.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/reduction_functions_binop.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/reduction_functions_binop.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/reduction_functions_binop.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/reduction_functions_binop.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/reduction_operator.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/reduction_operator.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/reduction_operator.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/reduction_operator.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/sequence.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/sequence.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/sequence.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/sequence.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/sequence_helper.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/sequence_helper.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/sequence_helper.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/sequence_helper.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/static_buffer.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/static_buffer.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/static_buffer.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/static_buffer.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/statically_indexed_array.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/statically_indexed_array.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/statically_indexed_array.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/statically_indexed_array.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/statically_indexed_array_multi_index.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/statically_indexed_array_multi_index.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/statically_indexed_array_multi_index.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/statically_indexed_array_multi_index.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/tuple.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/tuple.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/tuple.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/tuple.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/tuple_helper.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/tuple_helper.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/tuple_helper.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/tuple_helper.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/type.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/type.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/type.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/type.hpp
diff --git a/src/composable_kernel/composable_kernel/include/utility/utility.hpp b/src/legacy_composable_kernel/composable_kernel/include/utility/utility.hpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/include/utility/utility.hpp
rename to src/legacy_composable_kernel/composable_kernel/include/utility/utility.hpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/convolution_forward_implicit_gemm_v6r1_dlops_nchw_kcyx_nkhw.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/convolution_forward_implicit_gemm_v6r1_dlops_nchw_kcyx_nkhw.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/convolution_forward_implicit_gemm_v6r1_dlops_nchw_kcyx_nkhw.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/convolution_forward_implicit_gemm_v6r1_dlops_nchw_kcyx_nkhw.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_blockwise_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_multiblock_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_threadwise_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_first_call_warpwise_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_blockwise_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_threadwise_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_all_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_all_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_all_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_all_dims.cpp
diff --git a/src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_partial_dims.cpp b/src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_partial_dims.cpp
similarity index 100%
rename from src/composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_partial_dims.cpp
rename to src/legacy_composable_kernel/composable_kernel/src/kernel_wrapper/gridwise_generic_reduction_second_call_warpwise_reduce_partial_dims.cpp
diff --git a/src/composable_kernel/external/rocm/include/bfloat16_dev.hpp b/src/legacy_composable_kernel/external/rocm/include/bfloat16_dev.hpp
similarity index 100%
rename from src/composable_kernel/external/rocm/include/bfloat16_dev.hpp
rename to src/legacy_composable_kernel/external/rocm/include/bfloat16_dev.hpp
diff --git a/src/composable_kernel/host/solver/include/conv_igemm_fwd_v6r1_dlops_nchw_kcyx_nkhw.hpp b/src/legacy_composable_kernel/host/solver/include/conv_igemm_fwd_v6r1_dlops_nchw_kcyx_nkhw.hpp
similarity index 100%
rename from src/composable_kernel/host/solver/include/conv_igemm_fwd_v6r1_dlops_nchw_kcyx_nkhw.hpp
rename to src/legacy_composable_kernel/host/solver/include/conv_igemm_fwd_v6r1_dlops_nchw_kcyx_nkhw.hpp
diff --git a/src/composable_kernel/host/solver/include/convolution_problem_descriptor.hpp b/src/legacy_composable_kernel/host/solver/include/convolution_problem_descriptor.hpp
similarity index 100%
rename from src/composable_kernel/host/solver/include/convolution_problem_descriptor.hpp
rename to src/legacy_composable_kernel/host/solver/include/convolution_problem_descriptor.hpp
diff --git a/src/composable_kernel/host/solver/include/solver_common.hpp b/src/legacy_composable_kernel/host/solver/include/solver_common.hpp
similarity index 100%
rename from src/composable_kernel/host/solver/include/solver_common.hpp
rename to src/legacy_composable_kernel/host/solver/include/solver_common.hpp
diff --git a/src/reducetensor.cpp b/src/reducetensor.cpp
index 5be74eef19..8becd7fa00 100644
--- a/src/reducetensor.cpp
+++ b/src/reducetensor.cpp
@@ -37,8 +37,8 @@
 #include <utility>
 
 // headers from composable kernel, to get consistent ID mapping
-#include <../composable_kernel/composable_kernel/include/utility/data_type_enum.hpp>
-#include <../composable_kernel/composable_kernel/include/utility/reduction_enums.hpp>
+#include <../legacy_composable_kernel/composable_kernel/include/utility/data_type_enum.hpp>
+#include <../legacy_composable_kernel/composable_kernel/include/utility/reduction_enums.hpp>
 
 namespace miopen {
 
diff --git a/src/solver/conv/conv_ck_igemm_fwd_v6r1_dlops_nchw.cpp b/src/solver/conv/conv_ck_igemm_fwd_v6r1_dlops_nchw.cpp
index bd78776996..61dba30c7f 100644
--- a/src/solver/conv/conv_ck_igemm_fwd_v6r1_dlops_nchw.cpp
+++ b/src/solver/conv/conv_ck_igemm_fwd_v6r1_dlops_nchw.cpp
@@ -31,8 +31,8 @@
 #include <miopen/solver/implicitgemm_legacy_ck_util.hpp>
 #include <miopen/solver/legacy_ck_common.hpp>
 
-#include "../composable_kernel/host/solver/include/solver_common.hpp"
-#include "../composable_kernel/host/solver/include/conv_igemm_fwd_v6r1_dlops_nchw_kcyx_nkhw.hpp"
+#include "../legacy_composable_kernel/host/solver/include/solver_common.hpp"
+#include "../legacy_composable_kernel/host/solver/include/conv_igemm_fwd_v6r1_dlops_nchw_kcyx_nkhw.hpp"
 
 #define WORKAROUND_SWDEV_411729 1