Relocate contrib and libs (#5663)

* Relocate contrib and libs

Move contrib and libs into runtimes
Update CMakeLists.txt
Fix typo in CMakeLists.txt

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
* Update .gitignore and remove generated files

diff --git a/.gitignore b/.gitignore
index b535dd4..a8b3a11 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,8 @@
 /tools/cross/ndk
 
 # ignore the embeded cl_kernels
-/libs/ARMComputeEx/src/core/CL/cl_kernels/*.clembed
-/libs/ARMComputeEx/src/core/CL/cl_kernels/*.hembed
+/**/*.clembed
+/**/*.hembed
 
 # External directory
 /externals

diff --git a/infra/nnfw/CMakeLists.txt b/infra/nnfw/CMakeLists.txt
index 1afc5bc..c18cfbb 100644 (file)
--- a/infra/nnfw/CMakeLists.txt
+++ b/infra/nnfw/CMakeLists.txt
@@ -77,8 +77,8 @@ target_include_directories(nnapi-header INTERFACE ${NNFW_SOURCE_ROOT}/include)
 #
 # add_subdirectory(runtimes)
 
-add_subdirectory(${NNFW_SOURCE_ROOT}/contrib conrtib)
-add_subdirectory(${NNFW_SOURCE_ROOT}/libs libs)
+add_subdirectory(${NNFW_SOURCE_ROOT}/runtimes/contrib contrib)
+add_subdirectory(${NNFW_SOURCE_ROOT}/runtimes/libs libs)
 add_subdirectory(${NNFW_SOURCE_ROOT}/runtimes runtimes)
 add_subdirectory(${NNFW_SOURCE_ROOT}/tests tests)
 add_subdirectory(${NNFW_SOURCE_ROOT}/tools tools)

diff --git a/contrib/CMakeLists.txt b/runtimes/contrib/CMakeLists.txt
similarity index 100%
rename from contrib/CMakeLists.txt
rename to runtimes/contrib/CMakeLists.txt

diff --git a/contrib/README.md b/runtimes/contrib/README.md
similarity index 100%
rename from contrib/README.md
rename to runtimes/contrib/README.md

diff --git a/contrib/TFLiteSharp/README.md b/runtimes/contrib/TFLiteSharp/README.md
similarity index 100%
rename from contrib/TFLiteSharp/README.md
rename to runtimes/contrib/TFLiteSharp/README.md

diff --git a/contrib/TFLiteSharp/TFLiteNative/CMakeLists.txt b/runtimes/contrib/TFLiteSharp/TFLiteNative/CMakeLists.txt
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteNative/CMakeLists.txt
rename to runtimes/contrib/TFLiteSharp/TFLiteNative/CMakeLists.txt

diff --git a/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h b/runtimes/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h
rename to runtimes/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h

diff --git a/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h b/runtimes/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h
rename to runtimes/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h

diff --git a/contrib/TFLiteSharp/TFLiteNative/src/tflite_nativewrapper.cpp b/runtimes/contrib/TFLiteSharp/TFLiteNative/src/tflite_nativewrapper.cpp
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteNative/src/tflite_nativewrapper.cpp
rename to runtimes/contrib/TFLiteSharp/TFLiteNative/src/tflite_nativewrapper.cpp

diff --git a/contrib/TFLiteSharp/TFLiteNative/tflite-native.pc.in b/runtimes/contrib/TFLiteSharp/TFLiteNative/tflite-native.pc.in
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteNative/tflite-native.pc.in
rename to runtimes/contrib/TFLiteSharp/TFLiteNative/tflite-native.pc.in

diff --git a/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp.sln b/runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp.sln
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp.sln
rename to runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp.sln

diff --git a/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.Libraries.cs b/runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.Libraries.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.Libraries.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.Libraries.cs

diff --git a/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.TFLite.cs b/runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.TFLite.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.TFLite.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/Interop/Interop.TFLite.cs

diff --git a/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/TFLiteSharp.csproj b/runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/TFLiteSharp.csproj
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/TFLiteSharp.csproj
rename to runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/TFLiteSharp.csproj

diff --git a/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Datatype.cs b/runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Datatype.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Datatype.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Datatype.cs

diff --git a/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Interpreter.cs b/runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Interpreter.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Interpreter.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteSharp/TFLiteSharp/src/Interpreter.cs

diff --git a/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest.sln b/runtimes/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest.sln
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest.sln
rename to runtimes/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest.sln

diff --git a/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/Program.cs b/runtimes/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/Program.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/Program.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/Program.cs

diff --git a/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/TFLiteSharpTest.csproj b/runtimes/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/TFLiteSharpTest.csproj
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/TFLiteSharpTest.csproj
rename to runtimes/contrib/TFLiteSharp/TFLiteSharpTest/TFLiteSharpTest/TFLiteSharpTest.csproj

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp.csproj b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp.csproj
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp.csproj
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp.csproj

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_App.cs b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_App.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_App.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_App.cs

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_Main.cs b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_Main.cs
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_Main.cs
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/TFLiteTestApp_Main.cs

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/res/mobilenet_v1_1.0_224.tflite b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/res/mobilenet_v1_1.0_224.tflite
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/res/mobilenet_v1_1.0_224.tflite
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/res/mobilenet_v1_1.0_224.tflite

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/res/mouse1.bmp b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/res/mouse1.bmp
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/res/mouse1.bmp
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/res/mouse1.bmp

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/res/mouse_224.bmp b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/res/mouse_224.bmp
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/res/mouse_224.bmp
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/res/mouse_224.bmp

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/shared/res/TFLiteTestApp.png b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/shared/res/TFLiteTestApp.png
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/shared/res/TFLiteTestApp.png
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/shared/res/TFLiteTestApp.png

diff --git a/contrib/TFLiteSharp/TFLiteTestApp/tizen-manifest.xml b/runtimes/contrib/TFLiteSharp/TFLiteTestApp/tizen-manifest.xml
similarity index 100%
rename from contrib/TFLiteSharp/TFLiteTestApp/tizen-manifest.xml
rename to runtimes/contrib/TFLiteSharp/TFLiteTestApp/tizen-manifest.xml

diff --git a/contrib/TFLiteSharp/packaging/TFLiteSharp.manifest b/runtimes/contrib/TFLiteSharp/packaging/TFLiteSharp.manifest
similarity index 100%
rename from contrib/TFLiteSharp/packaging/TFLiteSharp.manifest
rename to runtimes/contrib/TFLiteSharp/packaging/TFLiteSharp.manifest

diff --git a/contrib/TFLiteSharp/packaging/TFLiteSharp.spec b/runtimes/contrib/TFLiteSharp/packaging/TFLiteSharp.spec
similarity index 100%
rename from contrib/TFLiteSharp/packaging/TFLiteSharp.spec
rename to runtimes/contrib/TFLiteSharp/packaging/TFLiteSharp.spec

diff --git a/contrib/TFLiteSharp/packaging/tflite-native.manifest b/runtimes/contrib/TFLiteSharp/packaging/tflite-native.manifest
similarity index 100%
rename from contrib/TFLiteSharp/packaging/tflite-native.manifest
rename to runtimes/contrib/TFLiteSharp/packaging/tflite-native.manifest

diff --git a/contrib/android_tflite/CMakeLists.txt b/runtimes/contrib/android_tflite/CMakeLists.txt
similarity index 100%
rename from contrib/android_tflite/CMakeLists.txt
rename to runtimes/contrib/android_tflite/CMakeLists.txt

diff --git a/contrib/benchmark_acl/.FORMATDENY b/runtimes/contrib/benchmark_acl/.FORMATDENY
similarity index 100%
rename from contrib/benchmark_acl/.FORMATDENY
rename to runtimes/contrib/benchmark_acl/.FORMATDENY

diff --git a/contrib/benchmark_acl/CMakeLists.txt b/runtimes/contrib/benchmark_acl/CMakeLists.txt
similarity index 100%
rename from contrib/benchmark_acl/CMakeLists.txt
rename to runtimes/contrib/benchmark_acl/CMakeLists.txt

diff --git a/contrib/benchmark_acl/src/Benchmark.cpp b/runtimes/contrib/benchmark_acl/src/Benchmark.cpp
similarity index 100%
rename from contrib/benchmark_acl/src/Benchmark.cpp
rename to runtimes/contrib/benchmark_acl/src/Benchmark.cpp

diff --git a/contrib/benchmark_acl/src/Benchmark.h b/runtimes/contrib/benchmark_acl/src/Benchmark.h
similarity index 100%
rename from contrib/benchmark_acl/src/Benchmark.h
rename to runtimes/contrib/benchmark_acl/src/Benchmark.h

diff --git a/contrib/benchmark_acl/src/benchmark_googlenet.cpp b/runtimes/contrib/benchmark_acl/src/benchmark_googlenet.cpp
similarity index 100%
rename from contrib/benchmark_acl/src/benchmark_googlenet.cpp
rename to runtimes/contrib/benchmark_acl/src/benchmark_googlenet.cpp

diff --git a/contrib/benchmark_acl/src/benchmark_inception_v3.cpp b/runtimes/contrib/benchmark_acl/src/benchmark_inception_v3.cpp
similarity index 100%
rename from contrib/benchmark_acl/src/benchmark_inception_v3.cpp
rename to runtimes/contrib/benchmark_acl/src/benchmark_inception_v3.cpp

diff --git a/contrib/benchmark_acl/src/benchmark_mobilenet.cpp b/runtimes/contrib/benchmark_acl/src/benchmark_mobilenet.cpp
similarity index 100%
rename from contrib/benchmark_acl/src/benchmark_mobilenet.cpp
rename to runtimes/contrib/benchmark_acl/src/benchmark_mobilenet.cpp

diff --git a/contrib/custom_op/README.md b/runtimes/contrib/custom_op/README.md
similarity index 100%
rename from contrib/custom_op/README.md
rename to runtimes/contrib/custom_op/README.md

diff --git a/contrib/custom_op/customOp-workflow.png b/runtimes/contrib/custom_op/customOp-workflow.png
similarity index 100%
rename from contrib/custom_op/customOp-workflow.png
rename to runtimes/contrib/custom_op/customOp-workflow.png

diff --git a/contrib/detection/CMakeLists.txt b/runtimes/contrib/detection/CMakeLists.txt
similarity index 100%
rename from contrib/detection/CMakeLists.txt
rename to runtimes/contrib/detection/CMakeLists.txt

diff --git a/contrib/detection/detection.cpp b/runtimes/contrib/detection/detection.cpp
similarity index 100%
rename from contrib/detection/detection.cpp
rename to runtimes/contrib/detection/detection.cpp

diff --git a/contrib/labs/CMakeLists.txt b/runtimes/contrib/labs/CMakeLists.txt
similarity index 100%
rename from contrib/labs/CMakeLists.txt
rename to runtimes/contrib/labs/CMakeLists.txt

diff --git a/contrib/labs/jniacl/CMakeLists.txt b/runtimes/contrib/labs/jniacl/CMakeLists.txt
similarity index 100%
rename from contrib/labs/jniacl/CMakeLists.txt
rename to runtimes/contrib/labs/jniacl/CMakeLists.txt

diff --git a/contrib/labs/jniacl/src/io_accessor.cc b/runtimes/contrib/labs/jniacl/src/io_accessor.cc
similarity index 100%
rename from contrib/labs/jniacl/src/io_accessor.cc
rename to runtimes/contrib/labs/jniacl/src/io_accessor.cc

diff --git a/contrib/labs/jniacl/src/io_accessor.h b/runtimes/contrib/labs/jniacl/src/io_accessor.h
similarity index 100%
rename from contrib/labs/jniacl/src/io_accessor.h
rename to runtimes/contrib/labs/jniacl/src/io_accessor.h

diff --git a/contrib/labs/jniacl/src/jniacl_main.cc b/runtimes/contrib/labs/jniacl/src/jniacl_main.cc
similarity index 100%
rename from contrib/labs/jniacl/src/jniacl_main.cc
rename to runtimes/contrib/labs/jniacl/src/jniacl_main.cc

diff --git a/contrib/labs/opencl_test/CMakeLists.txt b/runtimes/contrib/labs/opencl_test/CMakeLists.txt
similarity index 100%
rename from contrib/labs/opencl_test/CMakeLists.txt
rename to runtimes/contrib/labs/opencl_test/CMakeLists.txt

diff --git a/contrib/labs/opencl_test/README.md b/runtimes/contrib/labs/opencl_test/README.md
similarity index 100%
rename from contrib/labs/opencl_test/README.md
rename to runtimes/contrib/labs/opencl_test/README.md

diff --git a/contrib/labs/opencl_test/src/opencl_test.cc b/runtimes/contrib/labs/opencl_test/src/opencl_test.cc
similarity index 100%
rename from contrib/labs/opencl_test/src/opencl_test.cc
rename to runtimes/contrib/labs/opencl_test/src/opencl_test.cc

diff --git a/contrib/labs/tflite_examples/CMakeLists.txt b/runtimes/contrib/labs/tflite_examples/CMakeLists.txt
similarity index 100%
rename from contrib/labs/tflite_examples/CMakeLists.txt
rename to runtimes/contrib/labs/tflite_examples/CMakeLists.txt

diff --git a/contrib/labs/tflite_examples/src/conv.cpp b/runtimes/contrib/labs/tflite_examples/src/conv.cpp
similarity index 100%
rename from contrib/labs/tflite_examples/src/conv.cpp
rename to runtimes/contrib/labs/tflite_examples/src/conv.cpp

diff --git a/contrib/nnpackage/schema/nnpackage_model.fbs b/runtimes/contrib/nnpackage/schema/nnpackage_model.fbs
similarity index 100%
rename from contrib/nnpackage/schema/nnpackage_model.fbs
rename to runtimes/contrib/nnpackage/schema/nnpackage_model.fbs

diff --git a/contrib/nnpackage/spec/00_requirement.md b/runtimes/contrib/nnpackage/spec/00_requirement.md
similarity index 100%
rename from contrib/nnpackage/spec/00_requirement.md
rename to runtimes/contrib/nnpackage/spec/00_requirement.md

diff --git a/contrib/nnpackage/spec/10_packaging_and_manifest.md b/runtimes/contrib/nnpackage/spec/10_packaging_and_manifest.md
similarity index 100%
rename from contrib/nnpackage/spec/10_packaging_and_manifest.md
rename to runtimes/contrib/nnpackage/spec/10_packaging_and_manifest.md

diff --git a/contrib/nnpackage/spec/20_model_and_operators.md b/runtimes/contrib/nnpackage/spec/20_model_and_operators.md
similarity index 100%
rename from contrib/nnpackage/spec/20_model_and_operators.md
rename to runtimes/contrib/nnpackage/spec/20_model_and_operators.md

diff --git a/contrib/nnpackage/spec/30_custom_op.md b/runtimes/contrib/nnpackage/spec/30_custom_op.md
similarity index 100%
rename from contrib/nnpackage/spec/30_custom_op.md
rename to runtimes/contrib/nnpackage/spec/30_custom_op.md

diff --git a/contrib/tflite_classify/CMakeLists.txt b/runtimes/contrib/tflite_classify/CMakeLists.txt
similarity index 100%
rename from contrib/tflite_classify/CMakeLists.txt
rename to runtimes/contrib/tflite_classify/CMakeLists.txt

diff --git a/contrib/tflite_classify/src/ImageClassifier.cc b/runtimes/contrib/tflite_classify/src/ImageClassifier.cc
similarity index 100%
rename from contrib/tflite_classify/src/ImageClassifier.cc
rename to runtimes/contrib/tflite_classify/src/ImageClassifier.cc

diff --git a/contrib/tflite_classify/src/ImageClassifier.h b/runtimes/contrib/tflite_classify/src/ImageClassifier.h
similarity index 100%
rename from contrib/tflite_classify/src/ImageClassifier.h
rename to runtimes/contrib/tflite_classify/src/ImageClassifier.h

diff --git a/contrib/tflite_classify/src/InferenceInterface.cc b/runtimes/contrib/tflite_classify/src/InferenceInterface.cc
similarity index 100%
rename from contrib/tflite_classify/src/InferenceInterface.cc
rename to runtimes/contrib/tflite_classify/src/InferenceInterface.cc

diff --git a/contrib/tflite_classify/src/InferenceInterface.h b/runtimes/contrib/tflite_classify/src/InferenceInterface.h
similarity index 100%
rename from contrib/tflite_classify/src/InferenceInterface.h
rename to runtimes/contrib/tflite_classify/src/InferenceInterface.h

diff --git a/contrib/tflite_classify/src/tflite_classify.cc b/runtimes/contrib/tflite_classify/src/tflite_classify.cc
similarity index 100%
rename from contrib/tflite_classify/src/tflite_classify.cc
rename to runtimes/contrib/tflite_classify/src/tflite_classify.cc

diff --git a/contrib/tflite_test/CMakeLists.txt b/runtimes/contrib/tflite_test/CMakeLists.txt
similarity index 100%
rename from contrib/tflite_test/CMakeLists.txt
rename to runtimes/contrib/tflite_test/CMakeLists.txt

diff --git a/contrib/tflite_test/tflite_test.cpp b/runtimes/contrib/tflite_test/tflite_test.cpp
similarity index 100%
rename from contrib/tflite_test/tflite_test.cpp
rename to runtimes/contrib/tflite_test/tflite_test.cpp

diff --git a/contrib/uben/CMakeLists.txt b/runtimes/contrib/uben/CMakeLists.txt
similarity index 100%
rename from contrib/uben/CMakeLists.txt
rename to runtimes/contrib/uben/CMakeLists.txt

diff --git a/contrib/uben/Convolution.cpp b/runtimes/contrib/uben/Convolution.cpp
similarity index 100%
rename from contrib/uben/Convolution.cpp
rename to runtimes/contrib/uben/Convolution.cpp

diff --git a/contrib/uben/Softmax.cpp b/runtimes/contrib/uben/Softmax.cpp
similarity index 100%
rename from contrib/uben/Softmax.cpp
rename to runtimes/contrib/uben/Softmax.cpp

diff --git a/libs/ARMComputeEx/CMakeLists.txt b/runtimes/libs/ARMComputeEx/CMakeLists.txt
similarity index 100%
rename from libs/ARMComputeEx/CMakeLists.txt
rename to runtimes/libs/ARMComputeEx/CMakeLists.txt

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/CLKernelLibraryEx.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/CLKernelLibraryEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/CLKernelLibraryEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/CLKernelLibraryEx.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLArgOperationKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLArgOperationKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLArgOperationKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLArgOperationKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLBinaryLogicalOpKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLBinaryLogicalOpKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLBinaryLogicalOpKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLBinaryLogicalOpKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLCastKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLCastKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLCastKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLCastKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLDepthToSpaceKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLDepthToSpaceKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLDepthToSpaceKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLDepthToSpaceKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLEmbeddingLookupKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLEmbeddingLookupKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLEmbeddingLookupKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLEmbeddingLookupKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLGatherKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLGatherKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLGatherKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLGatherKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLHashtableLookupKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLHashtableLookupKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLHashtableLookupKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLHashtableLookupKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLNegKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLNegKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLNegKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLNegKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPReLUKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPReLUKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPReLUKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPReLUKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPermuteExKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPermuteExKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPermuteExKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLPermuteExKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLReduceOperationKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLReduceOperationKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLReduceOperationKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLReduceOperationKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToBatchNDKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToBatchNDKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToBatchNDKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToBatchNDKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToDepthKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToDepthKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToDepthKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLSpaceToDepthKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTopKV2Kernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTopKV2Kernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTopKV2Kernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTopKV2Kernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.h b/runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.h

diff --git a/libs/ARMComputeEx/arm_compute/core/TypesEx.h b/runtimes/libs/ARMComputeEx/arm_compute/core/TypesEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/TypesEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/TypesEx.h

diff --git a/libs/ARMComputeEx/arm_compute/core/UtilsEx.h b/runtimes/libs/ARMComputeEx/arm_compute/core/UtilsEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/UtilsEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/UtilsEx.h

diff --git a/libs/ARMComputeEx/arm_compute/core/utils/misc/ShapeCalculatorEx.h b/runtimes/libs/ARMComputeEx/arm_compute/core/utils/misc/ShapeCalculatorEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/core/utils/misc/ShapeCalculatorEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/core/utils/misc/ShapeCalculatorEx.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/CLFunctionsEx.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/CLFunctionsEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/CLFunctionsEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/CLFunctionsEx.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLArgOperation.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLArgOperation.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLArgOperation.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLArgOperation.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBatchToSpaceND.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBatchToSpaceND.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBatchToSpaceND.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBatchToSpaceND.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBinaryLogicalOp.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBinaryLogicalOp.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBinaryLogicalOp.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLBinaryLogicalOp.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLCast.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLCast.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLCast.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLCast.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLDepthToSpace.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLDepthToSpace.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLDepthToSpace.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLDepthToSpace.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLEmbeddingLookup.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLEmbeddingLookup.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLEmbeddingLookup.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLEmbeddingLookup.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLFullyConnectedReshapingLayer.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLFullyConnectedReshapingLayer.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLFullyConnectedReshapingLayer.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLFullyConnectedReshapingLayer.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLGather.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLGather.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLGather.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLGather.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLHashtableLookup.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLHashtableLookup.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLHashtableLookup.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLHashtableLookup.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLLogicalNot.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLLogicalNot.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLLogicalNot.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLLogicalNot.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLNeg.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLNeg.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLNeg.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLNeg.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPReLU.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPReLU.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPReLU.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPReLU.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPermuteEx.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPermuteEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPermuteEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPermuteEx.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPixelWiseDivision.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPixelWiseDivision.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPixelWiseDivision.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLPixelWiseDivision.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLRNNLayerEx.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLRNNLayerEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLRNNLayerEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLRNNLayerEx.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLReduceOperation.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLReduceOperation.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLReduceOperation.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLReduceOperation.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToBatchND.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToBatchND.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToBatchND.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToBatchND.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToDepth.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToDepth.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToDepth.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLSpaceToDepth.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLStridedSliceEx.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLStridedSliceEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLStridedSliceEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLStridedSliceEx.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTopKV2.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTopKV2.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTopKV2.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTopKV2.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayer.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayer.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayer.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayer.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayerUpsample.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayerUpsample.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayerUpsample.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/CL/functions/CLTransposeConvLayerUpsample.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/NEON/NEFunctionsEx.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/NEON/NEFunctionsEx.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/NEON/NEFunctionsEx.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/NEON/NEFunctionsEx.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/NEON/functions/NEFullyConnectedReshapingLayer.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/NEON/functions/NEFullyConnectedReshapingLayer.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/NEON/functions/NEFullyConnectedReshapingLayer.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/NEON/functions/NEFullyConnectedReshapingLayer.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericFullyConnectedLayer.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericFullyConnectedLayer.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericFullyConnectedLayer.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericFullyConnectedLayer.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericGather.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericGather.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericGather.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericGather.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericReshapeLayer.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericReshapeLayer.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericReshapeLayer.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/GenericReshapeLayer.h

diff --git a/libs/ARMComputeEx/arm_compute/runtime/misc/functions/Utils.h b/runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/Utils.h
similarity index 100%
rename from libs/ARMComputeEx/arm_compute/runtime/misc/functions/Utils.h
rename to runtimes/libs/ARMComputeEx/arm_compute/runtime/misc/functions/Utils.h

diff --git a/libs/ARMComputeEx/resolve_includes.py b/runtimes/libs/ARMComputeEx/resolve_includes.py
similarity index 100%
rename from libs/ARMComputeEx/resolve_includes.py
rename to runtimes/libs/ARMComputeEx/resolve_includes.py

diff --git a/libs/ARMComputeEx/src/core/CL/CLKernelLibrary.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/CLKernelLibrary.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/CLKernelLibrary.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/CLKernelLibrary.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/arg_operation.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/arg_operation.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/arg_operation.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/arg_operation.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/arithmetic_op_quantized.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/arithmetic_op_quantized.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/arithmetic_op_quantized.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/arithmetic_op_quantized.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/binary_logical_op.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/binary_logical_op.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/binary_logical_op.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/binary_logical_op.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/cast.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/cast.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/cast.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/cast.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/depth_to_space.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/depth_to_space.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/depth_to_space.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/depth_to_space.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/embedding_lookup.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/embedding_lookup.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/embedding_lookup.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/embedding_lookup.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/gather.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/gather.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/gather.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/gather.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/hashtable_lookup.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/hashtable_lookup.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/hashtable_lookup.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/hashtable_lookup.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/helpers.h b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/helpers.h
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/helpers.h
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/helpers.h

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/helpers_asymm.h b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/helpers_asymm.h
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/helpers_asymm.h
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/helpers_asymm.h

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/neg_tensor.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/neg_tensor.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/neg_tensor.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/neg_tensor.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/permute_ex.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/permute_ex.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/permute_ex.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/permute_ex.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/pixelwise_mul_quantized.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/pixelwise_mul_quantized.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/pixelwise_mul_quantized.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/pixelwise_mul_quantized.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/prelu.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/prelu.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/prelu.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/prelu.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/prelu_quantized.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/prelu_quantized.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/prelu_quantized.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/prelu_quantized.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/reduce_operation.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/reduce_operation.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/reduce_operation.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/reduce_operation.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_batch.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_batch.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_batch.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_batch.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_depth.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_depth.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_depth.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/space_to_depth.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_quicksort.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_quicksort.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_quicksort.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_quicksort.cl

diff --git a/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_radixsort.cl b/runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_radixsort.cl
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_radixsort.cl
rename to runtimes/libs/ARMComputeEx/src/core/CL/cl_kernels/topkv2_radixsort.cl

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLArgOperationKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLArgOperationKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLArgOperationKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLArgOperationKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLBinaryLogicalOpKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLBinaryLogicalOpKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLBinaryLogicalOpKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLBinaryLogicalOpKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLCastKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLCastKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLCastKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLCastKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLDepthToSpaceKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLDepthToSpaceKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLDepthToSpaceKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLDepthToSpaceKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLEmbeddingLookupKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLEmbeddingLookupKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLEmbeddingLookupKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLEmbeddingLookupKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLGatherKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLGatherKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLGatherKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLGatherKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLHashtableLookupKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLHashtableLookupKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLHashtableLookupKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLHashtableLookupKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLNegKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLNegKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLNegKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLNegKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLPReLUKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLPReLUKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLPReLUKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLPReLUKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLPermuteExKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLPermuteExKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLPermuteExKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLPermuteExKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLReduceOperationKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLReduceOperationKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLReduceOperationKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLReduceOperationKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToBatchNDKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToBatchNDKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToBatchNDKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToBatchNDKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToDepthKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToDepthKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToDepthKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLSpaceToDepthKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLTopKV2Kernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLTopKV2Kernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLTopKV2Kernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLTopKV2Kernel.cpp

diff --git a/libs/ARMComputeEx/src/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.cpp b/runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.cpp
rename to runtimes/libs/ARMComputeEx/src/core/CL/kernels/CLTransposeConvLayerUpsampleKernel.cpp

diff --git a/libs/ARMComputeEx/src/core/UtilsEx.cpp b/runtimes/libs/ARMComputeEx/src/core/UtilsEx.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/core/UtilsEx.cpp
rename to runtimes/libs/ARMComputeEx/src/core/UtilsEx.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/CLFunctionsEx.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/CLFunctionsEx.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/CLFunctionsEx.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/CLFunctionsEx.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLArgOperation.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLArgOperation.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLArgOperation.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLArgOperation.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLBinaryLogicalOp.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLBinaryLogicalOp.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLBinaryLogicalOp.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLBinaryLogicalOp.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLCast.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLCast.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLCast.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLCast.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLDepthToSpace.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLDepthToSpace.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLDepthToSpace.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLDepthToSpace.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLEmbeddingLookup.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLEmbeddingLookup.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLEmbeddingLookup.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLEmbeddingLookup.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLFullyConnectedReshapingLayer.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLFullyConnectedReshapingLayer.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLFullyConnectedReshapingLayer.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLFullyConnectedReshapingLayer.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLGather.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLGather.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLGather.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLGather.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLHashtableLookup.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLHashtableLookup.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLHashtableLookup.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLHashtableLookup.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLNeg.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLNeg.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLNeg.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLNeg.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLPReLU.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLPReLU.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLPReLU.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLPReLU.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLPermuteEx.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLPermuteEx.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLPermuteEx.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLPermuteEx.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLRNNLayerEx.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLRNNLayerEx.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLRNNLayerEx.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLRNNLayerEx.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLReduceOperation.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLReduceOperation.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLReduceOperation.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLReduceOperation.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToBatchND.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToBatchND.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToBatchND.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToBatchND.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToDepth.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToDepth.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToDepth.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLSpaceToDepth.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLTopKV2.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLTopKV2.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLTopKV2.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLTopKV2.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayer.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayer.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayer.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayer.cpp

diff --git a/libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayerUpsample.cpp b/runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayerUpsample.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayerUpsample.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/CL/functions/CLTransposeConvLayerUpsample.cpp

diff --git a/libs/ARMComputeEx/src/runtime/NEON/NEFunctionsEx.cpp b/runtimes/libs/ARMComputeEx/src/runtime/NEON/NEFunctionsEx.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/NEON/NEFunctionsEx.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/NEON/NEFunctionsEx.cpp

diff --git a/libs/ARMComputeEx/src/runtime/NEON/functions/NEFullyConnectedReshapingLayer.cpp b/runtimes/libs/ARMComputeEx/src/runtime/NEON/functions/NEFullyConnectedReshapingLayer.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/NEON/functions/NEFullyConnectedReshapingLayer.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/NEON/functions/NEFullyConnectedReshapingLayer.cpp

diff --git a/libs/ARMComputeEx/src/runtime/misc/functions/GenericFullyConnectedLayer.cpp b/runtimes/libs/ARMComputeEx/src/runtime/misc/functions/GenericFullyConnectedLayer.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/misc/functions/GenericFullyConnectedLayer.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/misc/functions/GenericFullyConnectedLayer.cpp

diff --git a/libs/ARMComputeEx/src/runtime/misc/functions/GenericGather.cpp b/runtimes/libs/ARMComputeEx/src/runtime/misc/functions/GenericGather.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/misc/functions/GenericGather.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/misc/functions/GenericGather.cpp

diff --git a/libs/ARMComputeEx/src/runtime/misc/functions/GenericReshapeLayer.cpp b/runtimes/libs/ARMComputeEx/src/runtime/misc/functions/GenericReshapeLayer.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/misc/functions/GenericReshapeLayer.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/misc/functions/GenericReshapeLayer.cpp

diff --git a/libs/ARMComputeEx/src/runtime/misc/functions/Utils.cpp b/runtimes/libs/ARMComputeEx/src/runtime/misc/functions/Utils.cpp
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/misc/functions/Utils.cpp
rename to runtimes/libs/ARMComputeEx/src/runtime/misc/functions/Utils.cpp

diff --git a/libs/ARMComputeEx/src/runtime/topk_v2.h b/runtimes/libs/ARMComputeEx/src/runtime/topk_v2.h
similarity index 100%
rename from libs/ARMComputeEx/src/runtime/topk_v2.h
rename to runtimes/libs/ARMComputeEx/src/runtime/topk_v2.h

diff --git a/libs/CMakeLists.txt b/runtimes/libs/CMakeLists.txt
similarity index 100%
rename from libs/CMakeLists.txt
rename to runtimes/libs/CMakeLists.txt

diff --git a/libs/cker/CMakeLists.txt b/runtimes/libs/cker/CMakeLists.txt
similarity index 100%
rename from libs/cker/CMakeLists.txt
rename to runtimes/libs/cker/CMakeLists.txt

diff --git a/libs/cker/README.md b/runtimes/libs/cker/README.md
similarity index 100%
rename from libs/cker/README.md
rename to runtimes/libs/cker/README.md

diff --git a/libs/cker/include/cker/Shape.h b/runtimes/libs/cker/include/cker/Shape.h
similarity index 100%
rename from libs/cker/include/cker/Shape.h
rename to runtimes/libs/cker/include/cker/Shape.h

diff --git a/libs/cker/include/cker/Types.h b/runtimes/libs/cker/include/cker/Types.h
similarity index 100%
rename from libs/cker/include/cker/Types.h
rename to runtimes/libs/cker/include/cker/Types.h

diff --git a/libs/cker/include/cker/Utils.h b/runtimes/libs/cker/include/cker/Utils.h
similarity index 100%
rename from libs/cker/include/cker/Utils.h
rename to runtimes/libs/cker/include/cker/Utils.h

diff --git a/libs/cker/include/cker/gemmlowp/FixedPoint.h b/runtimes/libs/cker/include/cker/gemmlowp/FixedPoint.h
similarity index 100%
rename from libs/cker/include/cker/gemmlowp/FixedPoint.h
rename to runtimes/libs/cker/include/cker/gemmlowp/FixedPoint.h

diff --git a/libs/cker/include/cker/operation/Add.h b/runtimes/libs/cker/include/cker/operation/Add.h
similarity index 100%
rename from libs/cker/include/cker/operation/Add.h
rename to runtimes/libs/cker/include/cker/operation/Add.h

diff --git a/libs/cker/include/cker/operation/AveragePool.h b/runtimes/libs/cker/include/cker/operation/AveragePool.h
similarity index 100%
rename from libs/cker/include/cker/operation/AveragePool.h
rename to runtimes/libs/cker/include/cker/operation/AveragePool.h

diff --git a/libs/cker/include/cker/operation/Concatenation.h b/runtimes/libs/cker/include/cker/operation/Concatenation.h
similarity index 100%
rename from libs/cker/include/cker/operation/Concatenation.h
rename to runtimes/libs/cker/include/cker/operation/Concatenation.h

diff --git a/libs/cker/include/cker/operation/Conv.h b/runtimes/libs/cker/include/cker/operation/Conv.h
similarity index 100%
rename from libs/cker/include/cker/operation/Conv.h
rename to runtimes/libs/cker/include/cker/operation/Conv.h

diff --git a/libs/cker/include/cker/operation/DepthwiseConv.h b/runtimes/libs/cker/include/cker/operation/DepthwiseConv.h
similarity index 100%
rename from libs/cker/include/cker/operation/DepthwiseConv.h
rename to runtimes/libs/cker/include/cker/operation/DepthwiseConv.h

diff --git a/libs/cker/include/cker/operation/FullyConnected.h b/runtimes/libs/cker/include/cker/operation/FullyConnected.h
similarity index 100%
rename from libs/cker/include/cker/operation/FullyConnected.h
rename to runtimes/libs/cker/include/cker/operation/FullyConnected.h

diff --git a/libs/cker/include/cker/operation/MaxPool.h b/runtimes/libs/cker/include/cker/operation/MaxPool.h
similarity index 100%
rename from libs/cker/include/cker/operation/MaxPool.h
rename to runtimes/libs/cker/include/cker/operation/MaxPool.h

diff --git a/libs/cker/include/cker/operation/SoftMax.h b/runtimes/libs/cker/include/cker/operation/SoftMax.h
similarity index 100%
rename from libs/cker/include/cker/operation/SoftMax.h
rename to runtimes/libs/cker/include/cker/operation/SoftMax.h

diff --git a/libs/cpp14/CMakeLists.txt b/runtimes/libs/cpp14/CMakeLists.txt
similarity index 100%
rename from libs/cpp14/CMakeLists.txt
rename to runtimes/libs/cpp14/CMakeLists.txt

diff --git a/libs/cpp14/include/cpp14/memory.h b/runtimes/libs/cpp14/include/cpp14/memory.h
similarity index 100%
rename from libs/cpp14/include/cpp14/memory.h
rename to runtimes/libs/cpp14/include/cpp14/memory.h

diff --git a/libs/jsoncpp/CMakeLists.txt b/runtimes/libs/jsoncpp/CMakeLists.txt
similarity index 100%
rename from libs/jsoncpp/CMakeLists.txt
rename to runtimes/libs/jsoncpp/CMakeLists.txt

diff --git a/libs/jsoncpp/README.md b/runtimes/libs/jsoncpp/README.md
similarity index 100%
rename from libs/jsoncpp/README.md
rename to runtimes/libs/jsoncpp/README.md

diff --git a/libs/jsoncpp/json/json-forwards.h b/runtimes/libs/jsoncpp/json/json-forwards.h
similarity index 100%
rename from libs/jsoncpp/json/json-forwards.h
rename to runtimes/libs/jsoncpp/json/json-forwards.h

diff --git a/libs/jsoncpp/json/json.h b/runtimes/libs/jsoncpp/json/json.h
similarity index 100%
rename from libs/jsoncpp/json/json.h
rename to runtimes/libs/jsoncpp/json/json.h

diff --git a/libs/jsoncpp/jsoncpp.cpp b/runtimes/libs/jsoncpp/jsoncpp.cpp
similarity index 100%
rename from libs/jsoncpp/jsoncpp.cpp
rename to runtimes/libs/jsoncpp/jsoncpp.cpp

diff --git a/libs/misc/CMakeLists.txt b/runtimes/libs/misc/CMakeLists.txt
similarity index 100%
rename from libs/misc/CMakeLists.txt
rename to runtimes/libs/misc/CMakeLists.txt

diff --git a/libs/misc/examples/tensor_index_iterator.cpp b/runtimes/libs/misc/examples/tensor_index_iterator.cpp
similarity index 100%
rename from libs/misc/examples/tensor_index_iterator.cpp
rename to runtimes/libs/misc/examples/tensor_index_iterator.cpp

diff --git a/libs/misc/include/misc/EnvVar.h b/runtimes/libs/misc/include/misc/EnvVar.h
similarity index 100%
rename from libs/misc/include/misc/EnvVar.h
rename to runtimes/libs/misc/include/misc/EnvVar.h

diff --git a/libs/misc/include/misc/benchmark.h b/runtimes/libs/misc/include/misc/benchmark.h
similarity index 100%
rename from libs/misc/include/misc/benchmark.h
rename to runtimes/libs/misc/include/misc/benchmark.h

diff --git a/libs/misc/include/misc/environment.h b/runtimes/libs/misc/include/misc/environment.h
similarity index 100%
rename from libs/misc/include/misc/environment.h
rename to runtimes/libs/misc/include/misc/environment.h

diff --git a/libs/misc/include/misc/feature/Index.h b/runtimes/libs/misc/include/misc/feature/Index.h
similarity index 100%
rename from libs/misc/include/misc/feature/Index.h
rename to runtimes/libs/misc/include/misc/feature/Index.h

diff --git a/libs/misc/include/misc/feature/IndexIterator.h b/runtimes/libs/misc/include/misc/feature/IndexIterator.h
similarity index 100%
rename from libs/misc/include/misc/feature/IndexIterator.h
rename to runtimes/libs/misc/include/misc/feature/IndexIterator.h

diff --git a/libs/misc/include/misc/feature/Object.h b/runtimes/libs/misc/include/misc/feature/Object.h
similarity index 100%
rename from libs/misc/include/misc/feature/Object.h
rename to runtimes/libs/misc/include/misc/feature/Object.h

diff --git a/libs/misc/include/misc/feature/Reader.h b/runtimes/libs/misc/include/misc/feature/Reader.h
similarity index 100%
rename from libs/misc/include/misc/feature/Reader.h
rename to runtimes/libs/misc/include/misc/feature/Reader.h

diff --git a/libs/misc/include/misc/feature/Shape.h b/runtimes/libs/misc/include/misc/feature/Shape.h
similarity index 100%
rename from libs/misc/include/misc/feature/Shape.h
rename to runtimes/libs/misc/include/misc/feature/Shape.h

diff --git a/libs/misc/include/misc/feature/TextFormatter.h b/runtimes/libs/misc/include/misc/feature/TextFormatter.h
similarity index 100%
rename from libs/misc/include/misc/feature/TextFormatter.h
rename to runtimes/libs/misc/include/misc/feature/TextFormatter.h

diff --git a/libs/misc/include/misc/fp32.h b/runtimes/libs/misc/include/misc/fp32.h
similarity index 100%
rename from libs/misc/include/misc/fp32.h
rename to runtimes/libs/misc/include/misc/fp32.h

diff --git a/libs/misc/include/misc/kernel/IndexIterator.h b/runtimes/libs/misc/include/misc/kernel/IndexIterator.h
similarity index 100%
rename from libs/misc/include/misc/kernel/IndexIterator.h
rename to runtimes/libs/misc/include/misc/kernel/IndexIterator.h

diff --git a/libs/misc/include/misc/kernel/Reader.h b/runtimes/libs/misc/include/misc/kernel/Reader.h
similarity index 100%
rename from libs/misc/include/misc/kernel/Reader.h
rename to runtimes/libs/misc/include/misc/kernel/Reader.h

diff --git a/libs/misc/include/misc/kernel/Shape.h b/runtimes/libs/misc/include/misc/kernel/Shape.h
similarity index 100%
rename from libs/misc/include/misc/kernel/Shape.h
rename to runtimes/libs/misc/include/misc/kernel/Shape.h

diff --git a/libs/misc/include/misc/matrix/IndexIterator.h b/runtimes/libs/misc/include/misc/matrix/IndexIterator.h
similarity index 100%
rename from libs/misc/include/misc/matrix/IndexIterator.h
rename to runtimes/libs/misc/include/misc/matrix/IndexIterator.h

diff --git a/libs/misc/include/misc/matrix/Reader.h b/runtimes/libs/misc/include/misc/matrix/Reader.h
similarity index 100%
rename from libs/misc/include/misc/matrix/Reader.h
rename to runtimes/libs/misc/include/misc/matrix/Reader.h

diff --git a/libs/misc/include/misc/matrix/Shape.h b/runtimes/libs/misc/include/misc/matrix/Shape.h
similarity index 100%
rename from libs/misc/include/misc/matrix/Shape.h
rename to runtimes/libs/misc/include/misc/matrix/Shape.h

diff --git a/libs/misc/include/misc/polymorphic_downcast.h b/runtimes/libs/misc/include/misc/polymorphic_downcast.h
similarity index 100%
rename from libs/misc/include/misc/polymorphic_downcast.h
rename to runtimes/libs/misc/include/misc/polymorphic_downcast.h

diff --git a/libs/misc/include/misc/string_helpers.h b/runtimes/libs/misc/include/misc/string_helpers.h
similarity index 100%
rename from libs/misc/include/misc/string_helpers.h
rename to runtimes/libs/misc/include/misc/string_helpers.h

diff --git a/libs/misc/include/misc/tensor/Comparator.h b/runtimes/libs/misc/include/misc/tensor/Comparator.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Comparator.h
rename to runtimes/libs/misc/include/misc/tensor/Comparator.h

diff --git a/libs/misc/include/misc/tensor/Diff.h b/runtimes/libs/misc/include/misc/tensor/Diff.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Diff.h
rename to runtimes/libs/misc/include/misc/tensor/Diff.h

diff --git a/libs/misc/include/misc/tensor/Index.h b/runtimes/libs/misc/include/misc/tensor/Index.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Index.h
rename to runtimes/libs/misc/include/misc/tensor/Index.h

diff --git a/libs/misc/include/misc/tensor/IndexEnumerator.h b/runtimes/libs/misc/include/misc/tensor/IndexEnumerator.h
similarity index 100%
rename from libs/misc/include/misc/tensor/IndexEnumerator.h
rename to runtimes/libs/misc/include/misc/tensor/IndexEnumerator.h

diff --git a/libs/misc/include/misc/tensor/IndexFormatter.h b/runtimes/libs/misc/include/misc/tensor/IndexFormatter.h
similarity index 100%
rename from libs/misc/include/misc/tensor/IndexFormatter.h
rename to runtimes/libs/misc/include/misc/tensor/IndexFormatter.h

diff --git a/libs/misc/include/misc/tensor/IndexIterator.h b/runtimes/libs/misc/include/misc/tensor/IndexIterator.h
similarity index 100%
rename from libs/misc/include/misc/tensor/IndexIterator.h
rename to runtimes/libs/misc/include/misc/tensor/IndexIterator.h

diff --git a/libs/misc/include/misc/tensor/NonIncreasingStride.h b/runtimes/libs/misc/include/misc/tensor/NonIncreasingStride.h
similarity index 100%
rename from libs/misc/include/misc/tensor/NonIncreasingStride.h
rename to runtimes/libs/misc/include/misc/tensor/NonIncreasingStride.h

diff --git a/libs/misc/include/misc/tensor/Object.h b/runtimes/libs/misc/include/misc/tensor/Object.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Object.h
rename to runtimes/libs/misc/include/misc/tensor/Object.h

diff --git a/libs/misc/include/misc/tensor/Reader.h b/runtimes/libs/misc/include/misc/tensor/Reader.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Reader.h
rename to runtimes/libs/misc/include/misc/tensor/Reader.h

diff --git a/libs/misc/include/misc/tensor/Shape.h b/runtimes/libs/misc/include/misc/tensor/Shape.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Shape.h
rename to runtimes/libs/misc/include/misc/tensor/Shape.h

diff --git a/libs/misc/include/misc/tensor/Zipper.h b/runtimes/libs/misc/include/misc/tensor/Zipper.h
similarity index 100%
rename from libs/misc/include/misc/tensor/Zipper.h
rename to runtimes/libs/misc/include/misc/tensor/Zipper.h

diff --git a/libs/misc/include/misc/vector.h b/runtimes/libs/misc/include/misc/vector.h
similarity index 100%
rename from libs/misc/include/misc/vector.h
rename to runtimes/libs/misc/include/misc/vector.h

diff --git a/libs/misc/include/misc/vector/Object.h b/runtimes/libs/misc/include/misc/vector/Object.h
similarity index 100%
rename from libs/misc/include/misc/vector/Object.h
rename to runtimes/libs/misc/include/misc/vector/Object.h

diff --git a/libs/misc/include/misc/vector/Reader.h b/runtimes/libs/misc/include/misc/vector/Reader.h
similarity index 100%
rename from libs/misc/include/misc/vector/Reader.h
rename to runtimes/libs/misc/include/misc/vector/Reader.h

diff --git a/libs/misc/src/environment.cpp b/runtimes/libs/misc/src/environment.cpp
similarity index 100%
rename from libs/misc/src/environment.cpp
rename to runtimes/libs/misc/src/environment.cpp

diff --git a/libs/misc/src/tensor/Comparator.cpp b/runtimes/libs/misc/src/tensor/Comparator.cpp
similarity index 100%
rename from libs/misc/src/tensor/Comparator.cpp
rename to runtimes/libs/misc/src/tensor/Comparator.cpp

diff --git a/libs/misc/src/tensor/IndexFormatter.cpp b/runtimes/libs/misc/src/tensor/IndexFormatter.cpp
similarity index 100%
rename from libs/misc/src/tensor/IndexFormatter.cpp
rename to runtimes/libs/misc/src/tensor/IndexFormatter.cpp

diff --git a/libs/misc/src/tensor/NonIncreasingStride.cpp b/runtimes/libs/misc/src/tensor/NonIncreasingStride.cpp
similarity index 100%
rename from libs/misc/src/tensor/NonIncreasingStride.cpp
rename to runtimes/libs/misc/src/tensor/NonIncreasingStride.cpp

diff --git a/libs/misc/src/tensor/Shape.cpp b/runtimes/libs/misc/src/tensor/Shape.cpp
similarity index 100%
rename from libs/misc/src/tensor/Shape.cpp
rename to runtimes/libs/misc/src/tensor/Shape.cpp

diff --git a/libs/profiling/CMakeLists.txt b/runtimes/libs/profiling/CMakeLists.txt
similarity index 100%
rename from libs/profiling/CMakeLists.txt
rename to runtimes/libs/profiling/CMakeLists.txt

diff --git a/libs/profiling/include/profiling/profile_buffer.h b/runtimes/libs/profiling/include/profiling/profile_buffer.h
similarity index 100%
rename from libs/profiling/include/profiling/profile_buffer.h
rename to runtimes/libs/profiling/include/profiling/profile_buffer.h

diff --git a/libs/profiling/include/profiling/profiler.h b/runtimes/libs/profiling/include/profiling/profiler.h
similarity index 100%
rename from libs/profiling/include/profiling/profiler.h
rename to runtimes/libs/profiling/include/profiling/profiler.h

diff --git a/libs/profiling/include/profiling/profiling.h b/runtimes/libs/profiling/include/profiling/profiling.h
similarity index 100%
rename from libs/profiling/include/profiling/profiling.h
rename to runtimes/libs/profiling/include/profiling/profiling.h

diff --git a/libs/profiling/include/profiling/time.h b/runtimes/libs/profiling/include/profiling/time.h
similarity index 100%
rename from libs/profiling/include/profiling/time.h
rename to runtimes/libs/profiling/include/profiling/time.h

diff --git a/libs/profiling/src/profiling/time.cpp b/runtimes/libs/profiling/src/profiling/time.cpp
similarity index 100%
rename from libs/profiling/src/profiling/time.cpp
rename to runtimes/libs/profiling/src/profiling/time.cpp

diff --git a/libs/rua/CMakeLists.txt b/runtimes/libs/rua/CMakeLists.txt
similarity index 100%
rename from libs/rua/CMakeLists.txt
rename to runtimes/libs/rua/CMakeLists.txt

diff --git a/libs/rua/README.md b/runtimes/libs/rua/README.md
similarity index 100%
rename from libs/rua/README.md
rename to runtimes/libs/rua/README.md

diff --git a/libs/rua/anchor/CMakeLists.txt b/runtimes/libs/rua/anchor/CMakeLists.txt
similarity index 100%
rename from libs/rua/anchor/CMakeLists.txt
rename to runtimes/libs/rua/anchor/CMakeLists.txt

diff --git a/libs/rua/anchor/include/rua/Anchor.h b/runtimes/libs/rua/anchor/include/rua/Anchor.h
similarity index 100%
rename from libs/rua/anchor/include/rua/Anchor.h
rename to runtimes/libs/rua/anchor/include/rua/Anchor.h

diff --git a/libs/rua/anchor/src/Anchor.cpp b/runtimes/libs/rua/anchor/src/Anchor.cpp
similarity index 100%
rename from libs/rua/anchor/src/Anchor.cpp
rename to runtimes/libs/rua/anchor/src/Anchor.cpp

diff --git a/libs/rua/core/CMakeLists.txt b/runtimes/libs/rua/core/CMakeLists.txt
similarity index 100%
rename from libs/rua/core/CMakeLists.txt
rename to runtimes/libs/rua/core/CMakeLists.txt

diff --git a/libs/rua/core/include/rua/Service.h b/runtimes/libs/rua/core/include/rua/Service.h
similarity index 100%
rename from libs/rua/core/include/rua/Service.h
rename to runtimes/libs/rua/core/include/rua/Service.h

diff --git a/libs/rua/dyn/CMakeLists.txt b/runtimes/libs/rua/dyn/CMakeLists.txt
similarity index 100%
rename from libs/rua/dyn/CMakeLists.txt
rename to runtimes/libs/rua/dyn/CMakeLists.txt

diff --git a/libs/rua/dyn/include/rua/DynamicBinder.h b/runtimes/libs/rua/dyn/include/rua/DynamicBinder.h
similarity index 100%
rename from libs/rua/dyn/include/rua/DynamicBinder.h
rename to runtimes/libs/rua/dyn/include/rua/DynamicBinder.h

diff --git a/libs/rua/dyn/src/DynamicBinder.cpp b/runtimes/libs/rua/dyn/src/DynamicBinder.cpp
similarity index 100%
rename from libs/rua/dyn/src/DynamicBinder.cpp
rename to runtimes/libs/rua/dyn/src/DynamicBinder.cpp

diff --git a/libs/rua/shim/CMakeLists.txt b/runtimes/libs/rua/shim/CMakeLists.txt
similarity index 100%
rename from libs/rua/shim/CMakeLists.txt
rename to runtimes/libs/rua/shim/CMakeLists.txt

diff --git a/libs/rua/shim/include/rua/Shim.h b/runtimes/libs/rua/shim/include/rua/Shim.h
similarity index 100%
rename from libs/rua/shim/include/rua/Shim.h
rename to runtimes/libs/rua/shim/include/rua/Shim.h

diff --git a/libs/tflite/CMakeLists.txt b/runtimes/libs/tflite/CMakeLists.txt
similarity index 100%
rename from libs/tflite/CMakeLists.txt
rename to runtimes/libs/tflite/CMakeLists.txt

diff --git a/libs/tflite/include/tflite/Assert.h b/runtimes/libs/tflite/include/tflite/Assert.h
similarity index 100%
rename from libs/tflite/include/tflite/Assert.h
rename to runtimes/libs/tflite/include/tflite/Assert.h

diff --git a/libs/tflite/include/tflite/Diff.h b/runtimes/libs/tflite/include/tflite/Diff.h
similarity index 100%
rename from libs/tflite/include/tflite/Diff.h
rename to runtimes/libs/tflite/include/tflite/Diff.h

diff --git a/libs/tflite/include/tflite/FeatureView.h b/runtimes/libs/tflite/include/tflite/FeatureView.h
similarity index 100%
rename from libs/tflite/include/tflite/FeatureView.h
rename to runtimes/libs/tflite/include/tflite/FeatureView.h

diff --git a/libs/tflite/include/tflite/InputIndex.h b/runtimes/libs/tflite/include/tflite/InputIndex.h
similarity index 100%
rename from libs/tflite/include/tflite/InputIndex.h
rename to runtimes/libs/tflite/include/tflite/InputIndex.h

diff --git a/libs/tflite/include/tflite/InterpreterSession.h b/runtimes/libs/tflite/include/tflite/InterpreterSession.h
similarity index 100%
rename from libs/tflite/include/tflite/InterpreterSession.h
rename to runtimes/libs/tflite/include/tflite/InterpreterSession.h

diff --git a/libs/tflite/include/tflite/NNAPISession.h b/runtimes/libs/tflite/include/tflite/NNAPISession.h
similarity index 100%
rename from libs/tflite/include/tflite/NNAPISession.h
rename to runtimes/libs/tflite/include/tflite/NNAPISession.h

diff --git a/libs/tflite/include/tflite/OutputIndex.h b/runtimes/libs/tflite/include/tflite/OutputIndex.h
similarity index 100%
rename from libs/tflite/include/tflite/OutputIndex.h
rename to runtimes/libs/tflite/include/tflite/OutputIndex.h

diff --git a/libs/tflite/include/tflite/Quantization.h b/runtimes/libs/tflite/include/tflite/Quantization.h
similarity index 100%
rename from libs/tflite/include/tflite/Quantization.h
rename to runtimes/libs/tflite/include/tflite/Quantization.h

diff --git a/libs/tflite/include/tflite/Session.h b/runtimes/libs/tflite/include/tflite/Session.h
similarity index 100%
rename from libs/tflite/include/tflite/Session.h
rename to runtimes/libs/tflite/include/tflite/Session.h

diff --git a/libs/tflite/include/tflite/TensorLogger.h b/runtimes/libs/tflite/include/tflite/TensorLogger.h
similarity index 100%
rename from libs/tflite/include/tflite/TensorLogger.h
rename to runtimes/libs/tflite/include/tflite/TensorLogger.h

diff --git a/libs/tflite/include/tflite/TensorShapeUtils.h b/runtimes/libs/tflite/include/tflite/TensorShapeUtils.h
similarity index 100%
rename from libs/tflite/include/tflite/TensorShapeUtils.h
rename to runtimes/libs/tflite/include/tflite/TensorShapeUtils.h

diff --git a/libs/tflite/include/tflite/TensorUtils.h b/runtimes/libs/tflite/include/tflite/TensorUtils.h
similarity index 100%
rename from libs/tflite/include/tflite/TensorUtils.h
rename to runtimes/libs/tflite/include/tflite/TensorUtils.h

diff --git a/libs/tflite/include/tflite/TensorView.h b/runtimes/libs/tflite/include/tflite/TensorView.h
similarity index 100%
rename from libs/tflite/include/tflite/TensorView.h
rename to runtimes/libs/tflite/include/tflite/TensorView.h

diff --git a/libs/tflite/include/tflite/ext/kernels/Abs.h b/runtimes/libs/tflite/include/tflite/ext/kernels/Abs.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/kernels/Abs.h
rename to runtimes/libs/tflite/include/tflite/ext/kernels/Abs.h

diff --git a/libs/tflite/include/tflite/ext/kernels/CustomOps.h b/runtimes/libs/tflite/include/tflite/ext/kernels/CustomOps.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/kernels/CustomOps.h
rename to runtimes/libs/tflite/include/tflite/ext/kernels/CustomOps.h

diff --git a/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h b/runtimes/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/kernels/SquaredDifference.h
rename to runtimes/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h

diff --git a/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h b/runtimes/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h
rename to runtimes/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h

diff --git a/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h b/runtimes/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h
rename to runtimes/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h

diff --git a/libs/tflite/include/tflite/ext/kernels/register.h b/runtimes/libs/tflite/include/tflite/ext/kernels/register.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/kernels/register.h
rename to runtimes/libs/tflite/include/tflite/ext/kernels/register.h

diff --git a/libs/tflite/include/tflite/ext/nnapi_delegate.h b/runtimes/libs/tflite/include/tflite/ext/nnapi_delegate.h
similarity index 100%
rename from libs/tflite/include/tflite/ext/nnapi_delegate.h
rename to runtimes/libs/tflite/include/tflite/ext/nnapi_delegate.h

diff --git a/libs/tflite/include/tflite/interp/Builder.h b/runtimes/libs/tflite/include/tflite/interp/Builder.h
similarity index 100%
rename from libs/tflite/include/tflite/interp/Builder.h
rename to runtimes/libs/tflite/include/tflite/interp/Builder.h

diff --git a/libs/tflite/include/tflite/interp/FlatBufferBuilder.h b/runtimes/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
similarity index 100%
rename from libs/tflite/include/tflite/interp/FlatBufferBuilder.h
rename to runtimes/libs/tflite/include/tflite/interp/FlatBufferBuilder.h

diff --git a/libs/tflite/include/tflite/interp/FunctionBuilder.h b/runtimes/libs/tflite/include/tflite/interp/FunctionBuilder.h
similarity index 100%
rename from libs/tflite/include/tflite/interp/FunctionBuilder.h
rename to runtimes/libs/tflite/include/tflite/interp/FunctionBuilder.h

diff --git a/libs/tflite/src/Diff.cpp b/runtimes/libs/tflite/src/Diff.cpp
similarity index 100%
rename from libs/tflite/src/Diff.cpp
rename to runtimes/libs/tflite/src/Diff.cpp

diff --git a/libs/tflite/src/FeatureView.cpp b/runtimes/libs/tflite/src/FeatureView.cpp
similarity index 100%
rename from libs/tflite/src/FeatureView.cpp
rename to runtimes/libs/tflite/src/FeatureView.cpp

diff --git a/libs/tflite/src/Quantization.cpp b/runtimes/libs/tflite/src/Quantization.cpp
similarity index 100%
rename from libs/tflite/src/Quantization.cpp
rename to runtimes/libs/tflite/src/Quantization.cpp

diff --git a/libs/tflite/src/TensorShapeUtils.cpp b/runtimes/libs/tflite/src/TensorShapeUtils.cpp
similarity index 100%
rename from libs/tflite/src/TensorShapeUtils.cpp
rename to runtimes/libs/tflite/src/TensorShapeUtils.cpp

diff --git a/libs/tflite/src/TensorView.test.cpp b/runtimes/libs/tflite/src/TensorView.test.cpp
similarity index 100%
rename from libs/tflite/src/TensorView.test.cpp
rename to runtimes/libs/tflite/src/TensorView.test.cpp

diff --git a/libs/tflite/src/ext/kernels/Abs.cpp b/runtimes/libs/tflite/src/ext/kernels/Abs.cpp
similarity index 100%
rename from libs/tflite/src/ext/kernels/Abs.cpp
rename to runtimes/libs/tflite/src/ext/kernels/Abs.cpp

diff --git a/libs/tflite/src/ext/kernels/SquaredDifference.cpp b/runtimes/libs/tflite/src/ext/kernels/SquaredDifference.cpp
similarity index 100%
rename from libs/tflite/src/ext/kernels/SquaredDifference.cpp
rename to runtimes/libs/tflite/src/ext/kernels/SquaredDifference.cpp

diff --git a/libs/tflite/src/ext/kernels/TensorFlowMax.cpp b/runtimes/libs/tflite/src/ext/kernels/TensorFlowMax.cpp
similarity index 100%
rename from libs/tflite/src/ext/kernels/TensorFlowMax.cpp
rename to runtimes/libs/tflite/src/ext/kernels/TensorFlowMax.cpp

diff --git a/libs/tflite/src/ext/kernels/TensorFlowSum.cpp b/runtimes/libs/tflite/src/ext/kernels/TensorFlowSum.cpp
similarity index 100%
rename from libs/tflite/src/ext/kernels/TensorFlowSum.cpp
rename to runtimes/libs/tflite/src/ext/kernels/TensorFlowSum.cpp

diff --git a/libs/tflite/src/ext/kernels/register.cpp b/runtimes/libs/tflite/src/ext/kernels/register.cpp
similarity index 100%
rename from libs/tflite/src/ext/kernels/register.cpp
rename to runtimes/libs/tflite/src/ext/kernels/register.cpp

diff --git a/libs/tflite/src/ext/nnapi_delegate.cpp b/runtimes/libs/tflite/src/ext/nnapi_delegate.cpp
similarity index 100%
rename from libs/tflite/src/ext/nnapi_delegate.cpp
rename to runtimes/libs/tflite/src/ext/nnapi_delegate.cpp

diff --git a/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc b/runtimes/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
similarity index 100%
rename from libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
rename to runtimes/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc

diff --git a/libs/tflite/src/interp/FlatBufferBuilder.cpp b/runtimes/libs/tflite/src/interp/FlatBufferBuilder.cpp
similarity index 100%
rename from libs/tflite/src/interp/FlatBufferBuilder.cpp
rename to runtimes/libs/tflite/src/interp/FlatBufferBuilder.cpp

diff --git a/libs/tflite/src/interp/FunctionBuilder.cpp b/runtimes/libs/tflite/src/interp/FunctionBuilder.cpp
similarity index 100%
rename from libs/tflite/src/interp/FunctionBuilder.cpp
rename to runtimes/libs/tflite/src/interp/FunctionBuilder.cpp

diff --git a/libs/xdata/CMakeLists.txt b/runtimes/libs/xdata/CMakeLists.txt
similarity index 100%
rename from libs/xdata/CMakeLists.txt
rename to runtimes/libs/xdata/CMakeLists.txt

diff --git a/libs/xdata/README.md b/runtimes/libs/xdata/README.md
similarity index 100%
rename from libs/xdata/README.md
rename to runtimes/libs/xdata/README.md

diff --git a/libs/xdata/include/xdata.h b/runtimes/libs/xdata/include/xdata.h
similarity index 100%
rename from libs/xdata/include/xdata.h
rename to runtimes/libs/xdata/include/xdata.h

diff --git a/libs/xdata/include/xdata/trace.h b/runtimes/libs/xdata/include/xdata/trace.h
similarity index 100%
rename from libs/xdata/include/xdata/trace.h
rename to runtimes/libs/xdata/include/xdata/trace.h

diff --git a/libs/xdata/src/trace.cpp b/runtimes/libs/xdata/src/trace.cpp
similarity index 100%
rename from libs/xdata/src/trace.cpp
rename to runtimes/libs/xdata/src/trace.cpp

diff --git a/libs/xprobe/CMakeLists.txt b/runtimes/libs/xprobe/CMakeLists.txt
similarity index 100%
rename from libs/xprobe/CMakeLists.txt
rename to runtimes/libs/xprobe/CMakeLists.txt

diff --git a/libs/xprobe/include/xprobe.h b/runtimes/libs/xprobe/include/xprobe.h
similarity index 100%
rename from libs/xprobe/include/xprobe.h
rename to runtimes/libs/xprobe/include/xprobe.h

diff --git a/libs/xprobe/include/xprobe/trace.h b/runtimes/libs/xprobe/include/xprobe/trace.h
similarity index 100%
rename from libs/xprobe/include/xprobe/trace.h
rename to runtimes/libs/xprobe/include/xprobe/trace.h

diff --git a/libs/xprobe/src/trace.cpp b/runtimes/libs/xprobe/src/trace.cpp
similarity index 100%
rename from libs/xprobe/src/trace.cpp
rename to runtimes/libs/xprobe/src/trace.cpp

diff --git a/libs/xray/CMakeLists.txt b/runtimes/libs/xray/CMakeLists.txt
similarity index 100%
rename from libs/xray/CMakeLists.txt
rename to runtimes/libs/xray/CMakeLists.txt

diff --git a/libs/xray/event/CMakeLists.txt b/runtimes/libs/xray/event/CMakeLists.txt
similarity index 100%
rename from libs/xray/event/CMakeLists.txt
rename to runtimes/libs/xray/event/CMakeLists.txt

diff --git a/libs/xray/event/include/xray/event.h b/runtimes/libs/xray/event/include/xray/event.h
similarity index 100%
rename from libs/xray/event/include/xray/event.h
rename to runtimes/libs/xray/event/include/xray/event.h

diff --git a/libs/xray/event/include/xray/event_category.h b/runtimes/libs/xray/event/include/xray/event_category.h
similarity index 100%
rename from libs/xray/event/include/xray/event_category.h
rename to runtimes/libs/xray/event/include/xray/event_category.h

diff --git a/libs/xray/event/include/xray/event_code.h b/runtimes/libs/xray/event/include/xray/event_code.h
similarity index 100%
rename from libs/xray/event/include/xray/event_code.h
rename to runtimes/libs/xray/event/include/xray/event_code.h

diff --git a/libs/xray/mux/CMakeLists.txt b/runtimes/libs/xray/mux/CMakeLists.txt
similarity index 100%
rename from libs/xray/mux/CMakeLists.txt
rename to runtimes/libs/xray/mux/CMakeLists.txt

diff --git a/libs/xray/mux/include/xray/mux.h b/runtimes/libs/xray/mux/include/xray/mux.h
similarity index 100%
rename from libs/xray/mux/include/xray/mux.h
rename to runtimes/libs/xray/mux/include/xray/mux.h

diff --git a/libs/xray/mux/src/mux.cc b/runtimes/libs/xray/mux/src/mux.cc
similarity index 100%
rename from libs/xray/mux/src/mux.cc
rename to runtimes/libs/xray/mux/src/mux.cc

diff --git a/libs/xray/pipe/CMakeLists.txt b/runtimes/libs/xray/pipe/CMakeLists.txt
similarity index 100%
rename from libs/xray/pipe/CMakeLists.txt
rename to runtimes/libs/xray/pipe/CMakeLists.txt

diff --git a/libs/xray/pipe/include/xray/pipe.h b/runtimes/libs/xray/pipe/include/xray/pipe.h
similarity index 100%
rename from libs/xray/pipe/include/xray/pipe.h
rename to runtimes/libs/xray/pipe/include/xray/pipe.h