IVGCVSW-1900 : CL backend folder structure

* moving backends/ClWorkloads to backends/cl * and moving pure Cl workload related code to backends/cl/workloads Change-Id: I019a3c6b4da5e7a23074bf03fb057e63199ad129
author: David Beck <david.beck@arm.com> 2018-09-26 17:41:13 +0100
committer: Matthew Bentham <matthew.bentham@arm.com> 2018-10-10 16:16:57 +0100
commit: ac42efd972b7d03da17f057b2ceaaac5d6e96b1a (patch)
tree: 1ebc1320fa3ea7f494d3716ea79a2bda0f4ffd1e
parent: bcd3c85b5a7657b38f503676b88a80ae74165acd (diff)
download: armnn-ac42efd972b7d03da17f057b2ceaaac5d6e96b1a.tar.gz
176 files changed, 454 insertions, 402 deletions
diff --git a/Android.mk b/Android.mk
index 56bc1340e3..25f3349cb9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,15 +64,12 @@ LOCAL_SRC_FILES := \
         src/armnnUtils/Logging.cpp \
         src/armnnUtils/Permute.cpp \
         src/backends/aclCommon/ArmComputeTensorUtils.cpp \
-        src/backends/ClWorkloadFactory.cpp \
-        src/backends/ClContextControl.cpp \
         src/backends/CpuTensorHandle.cpp \
         src/backends/MemCopyWorkload.cpp \
         src/backends/WorkloadData.cpp \
         src/backends/WorkloadFactory.cpp \
         src/backends/OutputHandler.cpp \
         src/backends/StringMapping.cpp \
-        src/backends/ClLayerSupport.cpp \
         src/armnn/layers/ActivationLayer.cpp \
         src/armnn/layers/AdditionLayer.cpp \
         src/armnn/layers/ArithmeticBaseLayer.cpp \
diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp
index b0a3ac543b..d9229203ea 100644
--- a/src/armnn/Layer.cpp
+++ b/src/armnn/Layer.cpp
@@ -5,12 +5,12 @@
 #include "Layer.hpp"
 
 #include "Graph.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/WorkloadData.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include <boost/cast.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
-#include "backends/CpuTensorHandle.hpp"
 
 #include <numeric>
 
diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp
index fd523cee9e..d897b255a6 100644
--- a/src/armnn/Layer.hpp
+++ b/src/armnn/Layer.hpp
@@ -6,9 +6,9 @@
 
 #include "LayerFwd.hpp"
 
-#include "backends/OutputHandler.hpp"
-#include "backends/WorkloadDataCollector.hpp"
-#include "backends/WorkloadInfo.hpp"
+#include <backends/OutputHandler.hpp>
+#include <backends/WorkloadDataCollector.hpp>
+#include <backends/WorkloadInfo.hpp>
 #include "InternalTypes.hpp"
 #include "SerializeLayerParameters.hpp"
 
diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp
index 74243df7ba..538f8e8cda 100644
--- a/src/armnn/LayerSupport.cpp
+++ b/src/armnn/LayerSupport.cpp
@@ -6,7 +6,7 @@
 
 #include <backends/reference/RefLayerSupport.hpp>
 #include <backends/neon/NeonLayerSupport.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include <boost/assert.hpp>
 
diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp
index 51551b395b..7808cc19e3 100644
--- a/src/armnn/LoadedNetwork.hpp
+++ b/src/armnn/LoadedNetwork.hpp
@@ -13,7 +13,7 @@
 
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/neon/NeonWorkloadFactory.hpp>
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 #include <backends/Workload.hpp>
 #include <backends/WorkloadFactory.hpp>
 
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 49e60e1ad4..76c33ba2e6 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -6,11 +6,13 @@
 #include "Graph.hpp"
 #include "Layer.hpp"
 #include "DeviceSpec.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
 #include "Optimizer.hpp"
-#include "armnn/Exceptions.hpp"
+#include "optimizations/All.hpp"
+
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
+#include <armnn/Exceptions.hpp>
 #include <armnn/Utils.hpp>
 #include <armnn/TypesUtils.hpp>
 
@@ -27,8 +29,6 @@
 #include <boost/numeric/conversion/converter_policies.hpp>
 #include <boost/cast.hpp>
 
-#include "optimizations/All.hpp"
-
 namespace armnn
 {
 
diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp
index b0a393d3f8..12211f4e04 100644
--- a/src/armnn/Runtime.hpp
+++ b/src/armnn/Runtime.hpp
@@ -6,10 +6,10 @@
 
 #include "LoadedNetwork.hpp"
 #include "DeviceSpec.hpp"
-#include "armnn/INetwork.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/Tensor.hpp"
-#include "backends/ClContextControl.hpp"
+#include <armnn/INetwork.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/Tensor.hpp>
+#include <backends/cl/ClContextControl.hpp>
 
 #include <mutex>
 #include <unordered_map>
diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp
index 01f1133c5c..3259d95afd 100644
--- a/src/armnn/layers/MeanLayer.cpp
+++ b/src/armnn/layers/MeanLayer.cpp
@@ -6,9 +6,9 @@
 #include "MeanLayer.hpp"
 #include "LayerCloneBase.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadData.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadData.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 #include <cstring>
 
@@ -44,7 +44,7 @@ void MeanLayer::ValidateTensorShapesFromInputs()
     VerifyLayerConnections(1, CHECK_LOCATION());
 
     const TensorInfo& input = GetInputSlot(0).GetConnection()->GetTensorInfo();
-    
+
     BOOST_ASSERT_MSG(input.GetNumDimensions() > 0 && input.GetNumDimensions() <= MaxNumOfTensorDimensions,
                      "MeanLayer: Mean supports up to 4D input.");
 
diff --git a/src/armnn/layers/PadLayer.cpp b/src/armnn/layers/PadLayer.cpp
index 6a1e9150b8..7511e80dae 100644
--- a/src/armnn/layers/PadLayer.cpp
+++ b/src/armnn/layers/PadLayer.cpp
@@ -6,9 +6,9 @@
 #include "PadLayer.hpp"
 #include "LayerCloneBase.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadData.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadData.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 #include <cstring>
 
diff --git a/src/armnn/memory/BaseMemoryManager.hpp b/src/armnn/memory/BaseMemoryManager.hpp
index 6710a785c7..c82eca6c1d 100644
--- a/src/armnn/memory/BaseMemoryManager.hpp
+++ b/src/armnn/memory/BaseMemoryManager.hpp
@@ -4,20 +4,20 @@
 //
 #pragma once
 
-#include "backends/WorkloadFactory.hpp"
+#include <backends/WorkloadFactory.hpp>
 
 #ifdef ARMCOMPUTENEON_ENABLED
-#include "arm_compute/runtime/MemoryGroup.h"
+#include <arm_compute/runtime/MemoryGroup.h>
 #endif
 
 #ifdef ARMCOMPUTECL_ENABLED
-#include "arm_compute/runtime/CL/CLMemoryGroup.h"
+#include <arm_compute/runtime/CL/CLMemoryGroup.h>
 #endif
 
 #if defined(ARMCOMPUTENEON_ENABLED) || defined(ARMCOMPUTECL_ENABLED)
-#include "arm_compute/runtime/IAllocator.h"
-#include "arm_compute/runtime/IMemoryGroup.h"
-#include "arm_compute/runtime/MemoryManagerOnDemand.h"
+#include <arm_compute/runtime/IAllocator.h>
+#include <arm_compute/runtime/IMemoryGroup.h>
+#include <arm_compute/runtime/MemoryManagerOnDemand.h>
 #endif
 
 namespace armnn
diff --git a/src/armnn/optimizations/ConvertConstants.hpp b/src/armnn/optimizations/ConvertConstants.hpp
index 7168effe0c..9306a53bf4 100644
--- a/src/armnn/optimizations/ConvertConstants.hpp
+++ b/src/armnn/optimizations/ConvertConstants.hpp
@@ -6,9 +6,9 @@
 #pragma once
 
 #include "Optimization.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "Half.hpp"
-#include "FloatingPointConverter.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <Half.hpp>
+#include <FloatingPointConverter.hpp>
 
 namespace armnn
 {
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index 61f9f1cd83..c111fe6016 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -8,12 +8,13 @@
 
 #include <boost/cast.hpp>
 
-#include "backends/WorkloadData.hpp"
-#include "Graph.hpp"
+#include <backends/WorkloadData.hpp>
+#include <backends/CpuTensorHandle.hpp>
+
+#include <Graph.hpp>
 
 #include <utility>
 
-#include "backends/CpuTensorHandle.hpp"
 
 using namespace armnn;
 
diff --git a/src/armnn/test/CreateWorkloadClNeon.hpp b/src/armnn/test/CreateWorkloadClNeon.hpp
index 6d02c95740..a18e85d5f0 100644
--- a/src/armnn/test/CreateWorkloadClNeon.hpp
+++ b/src/armnn/test/CreateWorkloadClNeon.hpp
@@ -8,7 +8,7 @@
 #include <backends/reference/RefWorkloadFactory.hpp>
 
 #if ARMCOMPUTECL_ENABLED
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #endif
 
 #if ARMCOMPUTENEON_ENABLED
diff --git a/src/armnn/test/EndToEndTest.cpp b/src/armnn/test/EndToEndTest.cpp
index 1d0886ed09..98b18411d4 100644
--- a/src/armnn/test/EndToEndTest.cpp
+++ b/src/armnn/test/EndToEndTest.cpp
@@ -4,11 +4,11 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "armnn/Descriptors.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 #include <boost/core/ignore_unused.hpp>
 
 #include <set>
diff --git a/src/armnn/test/FP16SupportTest.cpp b/src/armnn/test/FP16SupportTest.cpp
index 74ca372b0a..6baadc4c77 100644
--- a/src/armnn/test/FP16SupportTest.cpp
+++ b/src/armnn/test/FP16SupportTest.cpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "armnn/ArmNN.hpp"
-#include "armnn/Descriptors.hpp"
-#include "Graph.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
-#include "Optimizer.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/test/QuantizeHelper.hpp"
+#include <armnn/ArmNN.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
+#include <Graph.hpp>
+#include <Optimizer.hpp>
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/test/QuantizeHelper.hpp>
 
 #include <boost/core/ignore_unused.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp
index e38252917d..b297a74785 100644
--- a/src/armnn/test/GraphTests.cpp
+++ b/src/armnn/test/GraphTests.cpp
@@ -2,18 +2,19 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
+#include "GraphUtils.hpp"
+
 #include <boost/test/unit_test.hpp>
+#include <boost/cast.hpp>
 
-#include "armnn/ArmNN.hpp"
-#include "Graph.hpp"
-#include "Layer.hpp"
-#include "armnn/TypesUtils.hpp"
-#include "armnn/Exceptions.hpp"
+#include <armnn/ArmNN.hpp>
+#include <armnn/TypesUtils.hpp>
+#include <armnn/Exceptions.hpp>
+#include <Graph.hpp>
+#include <Layer.hpp>
 
-#include "GraphUtils.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
-#include <boost/cast.hpp>
 
 /// Checks that first comes before second in the order.
 bool CheckOrder(const armnn::Graph& graph, const armnn::Layer* first, const armnn::Layer* second)
diff --git a/src/armnn/test/JsonPrinterTests.cpp b/src/armnn/test/JsonPrinterTests.cpp
index aae7dba0f5..9c24fdaa7b 100644
--- a/src/armnn/test/JsonPrinterTests.cpp
+++ b/src/armnn/test/JsonPrinterTests.cpp
@@ -10,12 +10,12 @@
 #include <vector>
 #include <sstream>
 
-#include "Profiling.hpp"
-#include "armnn/Descriptors.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
-#include "backends/test/ClContextControlFixture.hpp"
-#include "backends/ClWorkloadFactory.hpp"
+#include <Profiling.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
+#include <backends/test/ClContextControlFixture.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(JsonPrinterTests, ClProfilingContextControlFixture)
 
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp
index 2f36f4da09..c342f22ced 100644
--- a/src/armnn/test/NetworkTests.cpp
+++ b/src/armnn/test/NetworkTests.cpp
@@ -9,7 +9,7 @@
 #include <Graph.hpp>
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/neon/NeonWorkloadFactory.hpp>
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 #include "GraphUtils.hpp"
 
diff --git a/src/armnn/test/OpenClTimerTest.cpp b/src/armnn/test/OpenClTimerTest.cpp
index 37cb085604..76cffec4f3 100644
--- a/src/armnn/test/OpenClTimerTest.cpp
+++ b/src/armnn/test/OpenClTimerTest.cpp
@@ -5,18 +5,18 @@
 
 #if (defined(__aarch64__)) || (defined(__x86_64__)) // disable test failing on FireFly/Armv7
 
-#include "arm_compute/runtime/CL/CLScheduler.h"
-#include "backends/ClContextControl.hpp"
-#include "backends/ClWorkloadFactory.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <arm_compute/runtime/CL/CLScheduler.h>
+#include <backends/cl/ClContextControl.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
+#include <backends/CpuTensorHandle.hpp>
 #include <boost/format.hpp>
 #include <iostream>
-#include "OpenClTimer.hpp"
-#include "backends/test/TensorCopyUtils.hpp"
+#include <OpenClTimer.hpp>
+#include <backends/test/TensorCopyUtils.hpp>
 #include "TensorHelpers.hpp"
 #include <boost/test/unit_test.hpp>
-#include "backends/WorkloadFactory.hpp"
-#include "backends/test/WorkloadTestUtils.hpp"
+#include <backends/WorkloadFactory.hpp>
+#include <backends/test/WorkloadTestUtils.hpp>
 
 using namespace armnn;
 
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp
index f8dff366da..9d351babd8 100644
--- a/src/armnn/test/OptimizerTests.cpp
+++ b/src/armnn/test/OptimizerTests.cpp
@@ -4,11 +4,11 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "armnn/ArmNN.hpp"
-#include "Graph.hpp"
-#include "Optimizer.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "FloatingPointConverter.hpp"
+#include <armnn/ArmNN.hpp>
+#include <Graph.hpp>
+#include <Optimizer.hpp>
+#include <backends/CpuTensorHandle.hpp>
+#include <FloatingPointConverter.hpp>
 
 namespace
 {
diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp
index a4d3cf62c7..7f3ac9ec95 100644
--- a/src/armnn/test/TensorHelpers.hpp
+++ b/src/armnn/test/TensorHelpers.hpp
@@ -16,9 +16,9 @@
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include "armnn/Tensor.hpp"
+#include <armnn/Tensor.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 
 #include <cmath>
 
diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
index f806caac27..c9c5cc1a7e 100644
--- a/src/backends/CMakeLists.txt
+++ b/src/backends/CMakeLists.txt
@@ -4,13 +4,6 @@
 #
 
 list(APPEND armnnBackendsCommon_sources
-    ClContextControl.cpp
-    ClContextControl.hpp
-    ClLayerSupport.cpp
-    ClLayerSupport.hpp
-    ClWorkloadFactory.cpp
-    ClWorkloadFactory.hpp
-    ClWorkloads.hpp
     CpuTensorHandle.cpp
     CpuTensorHandleFwd.hpp
     CpuTensorHandle.hpp
@@ -33,13 +26,6 @@ list(APPEND armnnBackendsCommon_sources
     WorkloadUtils.hpp
 )
 
-if(ARMCOMPUTECL)
-    # Additionally include source files for ARM Compute OpenCL backend
-    list(APPEND armnnBackendsCommon_sources
-        ClTensorHandle.hpp
-    )
-endif()
-
 add_library(armnnBackendsCommon STATIC ${armnnBackendsCommon_sources})
 target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src)
 target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
diff --git a/src/backends/ClWorkloads/backend.mk b/src/backends/ClWorkloads/backend.mk
deleted file mode 100644
index 9ac5004f64..0000000000
--- a/src/backends/ClWorkloads/backend.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright © 2017 ARM Ltd. All rights reserved.
-# SPDX-License-Identifier: MIT
-#
-
-# BACKEND_SOURCES contains the list of files to be included
-# in the Android build and it is picked up by the Android.mk
-# file in the root of ArmNN
-
-BACKEND_SOURCES := \
-        ClActivationFloatWorkload.cpp \
-        ClActivationUint8Workload.cpp \
-        ClAdditionWorkload.cpp \
-        ClSubtractionWorkload.cpp \
-        ClBaseConstantWorkload.cpp \
-        ClBatchNormalizationFloatWorkload.cpp \
-        ClConstantFloatWorkload.cpp \
-        ClConstantUint8Workload.cpp \
-        ClConvertFp16ToFp32Workload.cpp \
-        ClConvertFp32ToFp16Workload.cpp \
-        ClConvolution2dBaseWorkload.cpp \
-        ClConvolution2dFloatWorkload.cpp \
-        ClConvolution2dUint8Workload.cpp \
-        ClDepthwiseConvolutionBaseWorkload.cpp \
-        ClDepthwiseConvolutionFloatWorkload.cpp \
-        ClDepthwiseConvolutionUint8Workload.cpp \
-        ClDivisionFloatWorkload.cpp \
-        ClFloorFloatWorkload.cpp \
-        ClFullyConnectedWorkload.cpp \
-        ClL2NormalizationFloatWorkload.cpp \
-        ClLstmFloatWorkload.cpp \
-        ClMergerFloatWorkload.cpp \
-        ClMergerUint8Workload.cpp \
-        ClMultiplicationFloatWorkload.cpp \
-        ClNormalizationFloatWorkload.cpp \
-        ClPadWorkload.cpp \
-        ClPermuteWorkload.cpp \
-        ClPooling2dBaseWorkload.cpp \
-        ClPooling2dFloatWorkload.cpp \
-        ClPooling2dUint8Workload.cpp \
-        ClReshapeFloatWorkload.cpp \
-        ClReshapeUint8Workload.cpp \
-        ClResizeBilinearFloatWorkload.cpp \
-        ClSoftmaxBaseWorkload.cpp \
-        ClSoftmaxFloatWorkload.cpp \
-        ClSoftmaxUint8Workload.cpp \
-        ClSplitterFloatWorkload.cpp \
-        ClSplitterUint8Workload.cpp
-
diff --git a/src/backends/MemCopyWorkload.cpp b/src/backends/MemCopyWorkload.cpp
index 75271a09de..29f629ae50 100644
--- a/src/backends/MemCopyWorkload.cpp
+++ b/src/backends/MemCopyWorkload.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 //
 #include "MemCopyWorkload.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "TypeUtils.hpp"
+#include "CpuTensorHandle.hpp"
+#include <TypeUtils.hpp>
 
 #include <cstring>
 #include <boost/cast.hpp>
diff --git a/src/backends/MemCopyWorkload.hpp b/src/backends/MemCopyWorkload.hpp
index 5227f32c9f..782ce835aa 100644
--- a/src/backends/MemCopyWorkload.hpp
+++ b/src/backends/MemCopyWorkload.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "CpuTensorHandleFwd.hpp"
-#include "backends/Workload.hpp"
+#include "Workload.hpp"
 #include "WorkloadUtils.hpp"
 #include <utility>
 
diff --git a/src/backends/OutputHandler.cpp b/src/backends/OutputHandler.cpp
index 4dfa1a621e..15e90c7ba8 100644
--- a/src/backends/OutputHandler.cpp
+++ b/src/backends/OutputHandler.cpp
@@ -7,9 +7,9 @@
 #include <boost/assert.hpp>
 #include <boost/log/trivial.hpp>
 
-#include "backends/WorkloadFactory.hpp"
-#include "backends/WorkloadDataCollector.hpp"
-#include "backends/ITensorHandle.hpp"
+#include "WorkloadFactory.hpp"
+#include "WorkloadDataCollector.hpp"
+#include "ITensorHandle.hpp"
 
 namespace armnn
 {
diff --git a/src/backends/OutputHandler.hpp b/src/backends/OutputHandler.hpp
index 97da87d8cc..ad4a2931cd 100644
--- a/src/backends/OutputHandler.hpp
+++ b/src/backends/OutputHandler.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include "backends/WorkloadDataFwd.hpp"
+#include <backends/WorkloadDataFwd.hpp>
 
 #include <string>
 #include <vector>
@@ -14,10 +14,10 @@
 
 #include <boost/assert.hpp>
 
-#include "armnn/INetwork.hpp"
-#include "armnn/Types.hpp"
-#include "armnn/Descriptors.hpp"
-#include "armnn/Tensor.hpp"
+#include <armnn/INetwork.hpp>
+#include <armnn/Types.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/Tensor.hpp>
 #include "ITensorHandle.hpp"
 
 namespace armnn
diff --git a/src/backends/WorkloadFactory.cpp b/src/backends/WorkloadFactory.cpp
index aaccabd059..a70097eb82 100644
--- a/src/backends/WorkloadFactory.cpp
+++ b/src/backends/WorkloadFactory.cpp
@@ -5,7 +5,7 @@
 #include "WorkloadFactory.hpp"
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/neon/NeonWorkloadFactory.hpp>
-#include "ClWorkloadFactory.hpp"
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 #include <armnn/Types.hpp>
 #include <armnn/LayerSupport.hpp>
diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt
new file mode 100644
index 0000000000..80ca0acc08
--- /dev/null
+++ b/src/backends/cl/CMakeLists.txt
@@ -0,0 +1,22 @@
+#
+# Copyright © 2017 Arm Ltd. All rights reserved.
+# SPDX-License-Identifier: MIT
+#
+
+list(APPEND armnnClBackend_sources
+    ClContextControl.cpp
+    ClContextControl.hpp
+    ClLayerSupport.cpp
+    ClLayerSupport.hpp
+    ClWorkloadFactory.cpp
+    ClWorkloadFactory.hpp
+)
+
+if(ARMCOMPUTECL)
+    add_subdirectory(workloads test)
+endif()
+
+add_library(armnnClBackend STATIC ${armnnClBackend_sources})
+target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src)
+target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
+target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
diff --git a/src/backends/ClContextControl.cpp b/src/backends/cl/ClContextControl.cpp
index e8b21c942d..e8b21c942d 100644
--- a/src/backends/ClContextControl.cpp
+++ b/src/backends/cl/ClContextControl.cpp
diff --git a/src/backends/ClContextControl.hpp b/src/backends/cl/ClContextControl.hpp
index 5ac56423bd..5ac56423bd 100644
--- a/src/backends/ClContextControl.hpp
+++ b/src/backends/cl/ClContextControl.hpp
diff --git a/src/backends/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index c003d55397..6c1940b02f 100644
--- a/src/backends/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -14,24 +14,24 @@
 #include <boost/core/ignore_unused.hpp>
 
 #ifdef ARMCOMPUTECL_ENABLED
-#include "ClWorkloads/ClAdditionWorkload.hpp"
-#include "ClWorkloads/ClActivationFloatWorkload.hpp"
-#include "ClWorkloads/ClBatchNormalizationFloatWorkload.hpp"
-#include "ClWorkloads/ClConvertFp16ToFp32Workload.hpp"
-#include "ClWorkloads/ClConvertFp32ToFp16Workload.hpp"
-#include "ClWorkloads/ClConvolution2dBaseWorkload.hpp"
-#include "ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp"
-#include "ClWorkloads/ClDivisionFloatWorkload.hpp"
-#include "ClWorkloads/ClL2NormalizationFloatWorkload.hpp"
-#include "ClWorkloads/ClMultiplicationFloatWorkload.hpp"
-#include "ClWorkloads/ClFullyConnectedWorkload.hpp"
-#include "ClWorkloads/ClPadWorkload.hpp"
-#include "ClWorkloads/ClPooling2dBaseWorkload.hpp"
-#include "ClWorkloads/ClPermuteWorkload.hpp"
-#include "ClWorkloads/ClNormalizationFloatWorkload.hpp"
-#include "ClWorkloads/ClSoftmaxBaseWorkload.hpp"
-#include "ClWorkloads/ClSubtractionWorkload.hpp"
-#include "ClWorkloads/ClLstmFloatWorkload.hpp"
+#include "workloads/ClAdditionWorkload.hpp"
+#include "workloads/ClActivationFloatWorkload.hpp"
+#include "workloads/ClBatchNormalizationFloatWorkload.hpp"
+#include "workloads/ClConvertFp16ToFp32Workload.hpp"
+#include "workloads/ClConvertFp32ToFp16Workload.hpp"
+#include "workloads/ClConvolution2dBaseWorkload.hpp"
+#include "workloads/ClDepthwiseConvolutionBaseWorkload.hpp"
+#include "workloads/ClDivisionFloatWorkload.hpp"
+#include "workloads/ClL2NormalizationFloatWorkload.hpp"
+#include "workloads/ClMultiplicationFloatWorkload.hpp"
+#include "workloads/ClFullyConnectedWorkload.hpp"
+#include "workloads/ClPadWorkload.hpp"
+#include "workloads/ClPooling2dBaseWorkload.hpp"
+#include "workloads/ClPermuteWorkload.hpp"
+#include "workloads/ClNormalizationFloatWorkload.hpp"
+#include "workloads/ClSoftmaxBaseWorkload.hpp"
+#include "workloads/ClSubtractionWorkload.hpp"
+#include "workloads/ClLstmFloatWorkload.hpp"
 #endif
 
 using namespace boost;
diff --git a/src/backends/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp
index 700d71801d..700d71801d 100644
--- a/src/backends/ClLayerSupport.hpp
+++ b/src/backends/cl/ClLayerSupport.hpp
diff --git a/src/backends/ClTensorHandle.hpp b/src/backends/cl/ClTensorHandle.hpp
index 556e4479b6..556e4479b6 100644
--- a/src/backends/ClTensorHandle.hpp
+++ b/src/backends/cl/ClTensorHandle.hpp
diff --git a/src/backends/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp
index 6d7ff3d4e3..46a96559bf 100644
--- a/src/backends/ClWorkloadFactory.cpp
+++ b/src/backends/cl/ClWorkloadFactory.cpp
@@ -16,15 +16,15 @@
 #include <arm_compute/runtime/CL/CLBufferAllocator.h>
 #include <arm_compute/runtime/CL/CLScheduler.h>
 
-#include "ClWorkloads.hpp"
+#include <backends/cl/workloads/ClWorkloads.hpp>
 
 #include <backends/MemCopyWorkload.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 
 #include <memory/IPoolManager.hpp>
 #endif
 
-#include "MakeWorkloadHelper.hpp"
+#include <backends/MakeWorkloadHelper.hpp>
 
 #include <boost/polymorphic_cast.hpp>
 #include <boost/format.hpp>
diff --git a/src/backends/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp
index 59ae3b343a..59ae3b343a 100644
--- a/src/backends/ClWorkloadFactory.hpp
+++ b/src/backends/cl/ClWorkloadFactory.hpp
diff --git a/src/backends/ClWorkloads/backend.cmake b/src/backends/cl/backend.cmake
index e6b4673781..1af88e3c9b 100644
--- a/src/backends/ClWorkloads/backend.cmake
+++ b/src/backends/cl/backend.cmake
@@ -4,8 +4,10 @@
 #
 
 if(ARMCOMPUTECL)
-    add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/ClWorkloads)
-    list(APPEND armnnLibraries armnnClBackend)
+    add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl)
+    list(APPEND armnnLibraries armnnClBackend armnnClBackendWorkloads)
 else()
     message("CL backend is disabled")
+    add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl)
+    list(APPEND armnnLibraries armnnClBackend)
 endif()
diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk
new file mode 100644
index 0000000000..2418a24249
--- /dev/null
+++ b/src/backends/cl/backend.mk
@@ -0,0 +1,51 @@
+#
+# Copyright © 2017 ARM Ltd. All rights reserved.
+# SPDX-License-Identifier: MIT
+#
+
+# BACKEND_SOURCES contains the list of files to be included
+# in the Android build and it is picked up by the Android.mk
+# file in the root of ArmNN
+
+BACKEND_SOURCES := \
+        ClContextControl.cpp \
+        ClLayerSupport.cpp \
+        ClWorkloadFactory.cpp \
+        workloads/ClActivationFloatWorkload.cpp \
+        workloads/ClActivationUint8Workload.cpp \
+        workloads/ClAdditionWorkload.cpp \
+        workloads/ClBaseConstantWorkload.cpp \
+        workloads/ClBatchNormalizationFloatWorkload.cpp \
+        workloads/ClConstantFloatWorkload.cpp \
+        workloads/ClConstantUint8Workload.cpp \
+        workloads/ClConvertFp16ToFp32Workload.cpp \
+        workloads/ClConvertFp32ToFp16Workload.cpp \
+        workloads/ClConvolution2dBaseWorkload.cpp \
+        workloads/ClConvolution2dFloatWorkload.cpp \
+        workloads/ClConvolution2dUint8Workload.cpp \
+        workloads/ClDepthwiseConvolutionBaseWorkload.cpp \
+        workloads/ClDepthwiseConvolutionFloatWorkload.cpp \
+        workloads/ClDepthwiseConvolutionUint8Workload.cpp \
+        workloads/ClDivisionFloatWorkload.cpp \
+        workloads/ClFloorFloatWorkload.cpp \
+        workloads/ClFullyConnectedWorkload.cpp \
+        workloads/ClL2NormalizationFloatWorkload.cpp \
+        workloads/ClLstmFloatWorkload.cpp \
+        workloads/ClMergerFloatWorkload.cpp \
+        workloads/ClMergerUint8Workload.cpp \
+        workloads/ClMultiplicationFloatWorkload.cpp \
+        workloads/ClNormalizationFloatWorkload.cpp \
+        workloads/ClPadWorkload.cpp \
+        workloads/ClPermuteWorkload.cpp \
+        workloads/ClPooling2dBaseWorkload.cpp \
+        workloads/ClPooling2dFloatWorkload.cpp \
+        workloads/ClPooling2dUint8Workload.cpp \
+        workloads/ClReshapeFloatWorkload.cpp \
+        workloads/ClReshapeUint8Workload.cpp \
+        workloads/ClResizeBilinearFloatWorkload.cpp \
+        workloads/ClSoftmaxBaseWorkload.cpp \
+        workloads/ClSoftmaxFloatWorkload.cpp \
+        workloads/ClSoftmaxUint8Workload.cpp \
+        workloads/ClSplitterFloatWorkload.cpp \
+        workloads/ClSplitterUint8Workload.cpp \
+        workloads/ClSubtractionWorkload.cpp
diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/backends/cl/test/CMakeLists.txt
diff --git a/src/backends/ClWorkloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt
index ec61d534f0..066c37f083 100644
--- a/src/backends/ClWorkloads/CMakeLists.txt
+++ b/src/backends/cl/workloads/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-list(APPEND armnnClBackend_sources
+list(APPEND armnnClBackendWorkloads_sources
     ClActivationFloatWorkload.cpp
     ClActivationFloatWorkload.hpp
     ClActivationUint8Workload.cpp
@@ -82,10 +82,11 @@ list(APPEND armnnClBackend_sources
     ClSplitterUint8Workload.hpp
     ClSubtractionWorkload.cpp
     ClSubtractionWorkload.hpp
+    ClWorkloads.hpp
     ClWorkloadUtils.hpp
 )
 
-add_library(armnnClBackend STATIC ${armnnClBackend_sources})
-target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src)
-target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
-target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
+add_library(armnnClBackendWorkloads STATIC ${armnnClBackendWorkloads_sources})
+target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src)
+target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
+target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
diff --git a/src/backends/ClWorkloads/ClActivationFloatWorkload.cpp b/src/backends/cl/workloads/ClActivationFloatWorkload.cpp
index 10eef66ef2..cbaac9d226 100644
--- a/src/backends/ClWorkloads/ClActivationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClActivationFloatWorkload.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "ClActivationFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 
 #include "ClWorkloadUtils.hpp"
diff --git a/src/backends/ClWorkloads/ClActivationFloatWorkload.hpp b/src/backends/cl/workloads/ClActivationFloatWorkload.hpp
index e1b6fe13d8..cb560a791b 100644
--- a/src/backends/ClWorkloads/ClActivationFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClActivationFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClActivationUint8Workload.cpp b/src/backends/cl/workloads/ClActivationUint8Workload.cpp
index f41a97ae24..ad6b73074b 100644
--- a/src/backends/ClWorkloads/ClActivationUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClActivationUint8Workload.cpp
@@ -4,10 +4,10 @@
 //
 
 #include "ClActivationUint8Workload.hpp"
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include <backends/aclCommon/ArmComputeUtils.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
diff --git a/src/backends/ClWorkloads/ClActivationUint8Workload.hpp b/src/backends/cl/workloads/ClActivationUint8Workload.hpp
index bb2ff58853..d0b7d3a78f 100644
--- a/src/backends/ClWorkloads/ClActivationUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClActivationUint8Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClAdditionWorkload.cpp b/src/backends/cl/workloads/ClAdditionWorkload.cpp
index f43d3c126a..aa032e872c 100644
--- a/src/backends/ClWorkloads/ClAdditionWorkload.cpp
+++ b/src/backends/cl/workloads/ClAdditionWorkload.cpp
@@ -5,7 +5,7 @@
 
 #include "ClAdditionWorkload.hpp"
 
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
diff --git a/src/backends/ClWorkloads/ClAdditionWorkload.hpp b/src/backends/cl/workloads/ClAdditionWorkload.hpp
index b4706890d1..3e4ee26793 100644
--- a/src/backends/ClWorkloads/ClAdditionWorkload.hpp
+++ b/src/backends/cl/workloads/ClAdditionWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp b/src/backends/cl/workloads/ClBaseConstantWorkload.cpp
index 56af3b3baa..2557020b59 100644
--- a/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp
+++ b/src/backends/cl/workloads/ClBaseConstantWorkload.cpp
@@ -5,7 +5,7 @@
 
 #include "ClBaseConstantWorkload.hpp"
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <Half.hpp>
 
diff --git a/src/backends/ClWorkloads/ClBaseConstantWorkload.hpp b/src/backends/cl/workloads/ClBaseConstantWorkload.hpp
index ca1db389dc..f7a23a9162 100644
--- a/src/backends/ClWorkloads/ClBaseConstantWorkload.hpp
+++ b/src/backends/cl/workloads/ClBaseConstantWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClBaseMergerWorkload.hpp b/src/backends/cl/workloads/ClBaseMergerWorkload.hpp
index 420e074217..f8ff6f9379 100644
--- a/src/backends/ClWorkloads/ClBaseMergerWorkload.hpp
+++ b/src/backends/cl/workloads/ClBaseMergerWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClBaseSplitterWorkload.hpp b/src/backends/cl/workloads/ClBaseSplitterWorkload.hpp
index 41f382cac8..7fdcc84235 100644
--- a/src/backends/ClWorkloads/ClBaseSplitterWorkload.hpp
+++ b/src/backends/cl/workloads/ClBaseSplitterWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp
index 4d5c20f9bd..5bff7a63c9 100644
--- a/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp
@@ -4,10 +4,10 @@
 //
 
 #include "ClBatchNormalizationFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp
index 22c71b1073..804591c444 100644
--- a/src/backends/ClWorkloads/ClBatchNormalizationFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClConstantFloatWorkload.cpp b/src/backends/cl/workloads/ClConstantFloatWorkload.cpp
index 1565047c22..1565047c22 100644
--- a/src/backends/ClWorkloads/ClConstantFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClConstantFloatWorkload.cpp
diff --git a/src/backends/ClWorkloads/ClConstantFloatWorkload.hpp b/src/backends/cl/workloads/ClConstantFloatWorkload.hpp
index 0cbeaad9ea..0cbeaad9ea 100644
--- a/src/backends/ClWorkloads/ClConstantFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClConstantFloatWorkload.hpp
diff --git a/src/backends/ClWorkloads/ClConstantUint8Workload.cpp b/src/backends/cl/workloads/ClConstantUint8Workload.cpp
index a5ef0321cd..a5ef0321cd 100644
--- a/src/backends/ClWorkloads/ClConstantUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClConstantUint8Workload.cpp
diff --git a/src/backends/ClWorkloads/ClConstantUint8Workload.hpp b/src/backends/cl/workloads/ClConstantUint8Workload.hpp
index 30556dc0d6..30556dc0d6 100644
--- a/src/backends/ClWorkloads/ClConstantUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClConstantUint8Workload.hpp
diff --git a/src/backends/ClWorkloads/ClConvertFp16ToFp32Workload.cpp b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.cpp
index 534249aeac..e7663b4ca4 100644
--- a/src/backends/ClWorkloads/ClConvertFp16ToFp32Workload.cpp
+++ b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "ClConvertFp16ToFp32Workload.hpp"
-#include "backends/ClTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClConvertFp16ToFp32Workload.hpp b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp
index c72d2262b3..b6447488f7 100644
--- a/src/backends/ClWorkloads/ClConvertFp16ToFp32Workload.hpp
+++ b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClConvertFp32ToFp16Workload.cpp b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.cpp
index 73b3cbc542..2ae4adc424 100644
--- a/src/backends/ClWorkloads/ClConvertFp32ToFp16Workload.cpp
+++ b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "ClConvertFp32ToFp16Workload.hpp"
-#include "backends/ClTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClConvertFp32ToFp16Workload.hpp b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp
index fb6af02070..95d19905d7 100644
--- a/src/backends/ClWorkloads/ClConvertFp32ToFp16Workload.hpp
+++ b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dBaseWorkload.cpp
index 1f5094e143..58699a8287 100644
--- a/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp
+++ b/src/backends/cl/workloads/ClConvolution2dBaseWorkload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClConvolution2dBaseWorkload.hpp"
-#include <backends/ClLayerSupport.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
diff --git a/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.hpp b/src/backends/cl/workloads/ClConvolution2dBaseWorkload.hpp
index a983dba79a..a983dba79a 100644
--- a/src/backends/ClWorkloads/ClConvolution2dBaseWorkload.hpp
+++ b/src/backends/cl/workloads/ClConvolution2dBaseWorkload.hpp
diff --git a/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dFloatWorkload.cpp
index 72565966b8..813808345e 100644
--- a/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClConvolution2dFloatWorkload.cpp
@@ -4,10 +4,10 @@
 //
 
 #include "ClConvolution2dFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.hpp b/src/backends/cl/workloads/ClConvolution2dFloatWorkload.hpp
index 28ba53f38a..1f9710e1ea 100644
--- a/src/backends/ClWorkloads/ClConvolution2dFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClConvolution2dFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 #include <arm_compute/runtime/MemoryManagerOnDemand.h>
diff --git a/src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp b/src/backends/cl/workloads/ClConvolution2dUint8Workload.cpp
index a9faec0d77..d9b9dfd833 100644
--- a/src/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClConvolution2dUint8Workload.cpp
@@ -4,10 +4,10 @@
 //
 
 #include "ClConvolution2dUint8Workload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClConvolution2dUint8Workload.hpp b/src/backends/cl/workloads/ClConvolution2dUint8Workload.hpp
index f1f008b1b9..1720ec935c 100644
--- a/src/backends/ClWorkloads/ClConvolution2dUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClConvolution2dUint8Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 #include <arm_compute/runtime/MemoryManagerOnDemand.h>
diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp
index 18f45bb852..5a036db922 100644
--- a/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.cpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp
@@ -9,7 +9,7 @@
 
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 
 namespace armnn
diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.hpp
index 49a8b5d357..9d5cde30b6 100644
--- a/src/backends/ClWorkloads/ClDepthwiseConvolutionBaseWorkload.hpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 #include <boost/optional.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionFloatWorkload.cpp
index bc3b165490..17ecd29307 100644
--- a/src/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionFloatWorkload.cpp
@@ -5,7 +5,7 @@
 
 #include "ClDepthwiseConvolutionFloatWorkload.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.hpp b/src/backends/cl/workloads/ClDepthwiseConvolutionFloatWorkload.hpp
index 4f9d5f332e..4f9d5f332e 100644
--- a/src/backends/ClWorkloads/ClDepthwiseConvolutionFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionFloatWorkload.hpp
diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionUint8Workload.cpp
index 4ea5590486..22922e4df6 100644
--- a/src/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionUint8Workload.cpp
@@ -5,7 +5,7 @@
 
 #include "ClDepthwiseConvolutionUint8Workload.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.hpp b/src/backends/cl/workloads/ClDepthwiseConvolutionUint8Workload.hpp
index b9f676de94..b9f676de94 100644
--- a/src/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionUint8Workload.hpp
diff --git a/src/backends/ClWorkloads/ClDivisionFloatWorkload.cpp b/src/backends/cl/workloads/ClDivisionFloatWorkload.cpp
index 2371789035..a2d8534682 100644
--- a/src/backends/ClWorkloads/ClDivisionFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClDivisionFloatWorkload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClDivisionFloatWorkload.hpp"
-#include "backends/ClTensorHandle.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClDivisionFloatWorkload.hpp b/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp
index d34e11dab8..1aa7ec69f6 100644
--- a/src/backends/ClWorkloads/ClDivisionFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClFloorFloatWorkload.cpp b/src/backends/cl/workloads/ClFloorFloatWorkload.cpp
index d090a7da81..0a60fc3b5c 100644
--- a/src/backends/ClWorkloads/ClFloorFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClFloorFloatWorkload.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "ClFloorFloatWorkload.hpp"
-#include "backends/ClTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClFloorFloatWorkload.hpp b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp
index f269bcf30c..513862a4d7 100644
--- a/src/backends/ClWorkloads/ClFloorFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp
index 1ec39926ad..b3a97f35f8 100644
--- a/src/backends/ClWorkloads/ClFullyConnectedWorkload.cpp
+++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp
@@ -4,11 +4,11 @@
 //
 
 #include "ClFullyConnectedWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClFullyConnectedWorkload.hpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp
index a61610992e..0c9047235b 100644
--- a/src/backends/ClWorkloads/ClFullyConnectedWorkload.hpp
+++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 #include <arm_compute/runtime/MemoryManagerOnDemand.h>
diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp
index 0ca334348e..edc13bcfea 100644
--- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "ClL2NormalizationFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 
diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp
index 20c0426208..f7b7911f4c 100644
--- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClLstmFloatWorkload.cpp b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp
index 9e2563a3a5..352698ad1b 100644
--- a/src/backends/ClWorkloads/ClLstmFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClLstmFloatWorkload.cpp
@@ -4,9 +4,9 @@
 //
 
 #include "ClLstmFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
 #include <arm_compute/runtime/CL/functions/CLLSTMLayer.h>
diff --git a/src/backends/ClWorkloads/ClLstmFloatWorkload.hpp b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp
index 61d8fc3e6c..352d774a99 100644
--- a/src/backends/ClWorkloads/ClLstmFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClMergerFloatWorkload.cpp b/src/backends/cl/workloads/ClMergerFloatWorkload.cpp
index 151f1e0ee7..151f1e0ee7 100644
--- a/src/backends/ClWorkloads/ClMergerFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClMergerFloatWorkload.cpp
diff --git a/src/backends/ClWorkloads/ClMergerFloatWorkload.hpp b/src/backends/cl/workloads/ClMergerFloatWorkload.hpp
index 9782f7a8f3..9782f7a8f3 100644
--- a/src/backends/ClWorkloads/ClMergerFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClMergerFloatWorkload.hpp
diff --git a/src/backends/ClWorkloads/ClMergerUint8Workload.cpp b/src/backends/cl/workloads/ClMergerUint8Workload.cpp
index 9d1060d857..9d1060d857 100644
--- a/src/backends/ClWorkloads/ClMergerUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClMergerUint8Workload.cpp
diff --git a/src/backends/ClWorkloads/ClMergerUint8Workload.hpp b/src/backends/cl/workloads/ClMergerUint8Workload.hpp
index cbfc19a0f2..cbfc19a0f2 100644
--- a/src/backends/ClWorkloads/ClMergerUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClMergerUint8Workload.hpp
diff --git a/src/backends/ClWorkloads/ClMultiplicationFloatWorkload.cpp b/src/backends/cl/workloads/ClMultiplicationFloatWorkload.cpp
index c3330a98e8..d53e149129 100644
--- a/src/backends/ClWorkloads/ClMultiplicationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClMultiplicationFloatWorkload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClMultiplicationFloatWorkload.hpp"
-#include "backends/ClTensorHandle.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/CpuTensorHandle.hpp>
 #include "ClWorkloadUtils.hpp"
 
 namespace armnn
diff --git a/src/backends/ClWorkloads/ClMultiplicationFloatWorkload.hpp b/src/backends/cl/workloads/ClMultiplicationFloatWorkload.hpp
index c2d6b7697a..a793ac64df 100644
--- a/src/backends/ClWorkloads/ClMultiplicationFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClMultiplicationFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp
index d5863b444c..969c9bb08b 100644
--- a/src/backends/ClWorkloads/ClNormalizationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.cpp
@@ -4,9 +4,9 @@
 //
 
 #include "ClNormalizationFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 #include "ClWorkloadUtils.hpp"
diff --git a/src/backends/ClWorkloads/ClNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp
index f02d0adb70..f30be91aaa 100644
--- a/src/backends/ClWorkloads/ClNormalizationFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClPadWorkload.cpp b/src/backends/cl/workloads/ClPadWorkload.cpp
index 45a9d0dc44..45dc5e8be7 100644
--- a/src/backends/ClWorkloads/ClPadWorkload.cpp
+++ b/src/backends/cl/workloads/ClPadWorkload.cpp
@@ -5,11 +5,12 @@
 
 #include "ClPadWorkload.hpp"
 
-#include "backends/ClTensorHandle.hpp"
-#include "backends/aclCommon/ArmComputeTensorUtils.hpp"
-#include "ClWorkloadUtils.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 #include <arm_compute/core/Types.h>
 
+#include "ClWorkloadUtils.hpp"
+
 namespace armnn
 {
 using namespace armcomputetensorutils;
diff --git a/src/backends/ClWorkloads/ClPadWorkload.hpp b/src/backends/cl/workloads/ClPadWorkload.hpp
index 0ec560d545..a7ad6670a7 100644
--- a/src/backends/ClWorkloads/ClPadWorkload.hpp
+++ b/src/backends/cl/workloads/ClPadWorkload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/WorkloadData.hpp"
-#include "backends/Workload.hpp"
+#include <backends/WorkloadData.hpp>
+#include <backends/Workload.hpp>
 #include <arm_compute/runtime/CL/functions/CLPadLayer.h>
 
 namespace armnn {
diff --git a/src/backends/ClWorkloads/ClPermuteWorkload.cpp b/src/backends/cl/workloads/ClPermuteWorkload.cpp
index 11b0df80dd..079772dbaf 100644
--- a/src/backends/ClWorkloads/ClPermuteWorkload.cpp
+++ b/src/backends/cl/workloads/ClPermuteWorkload.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "ClPermuteWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
 #include <arm_compute/core/Error.h>
diff --git a/src/backends/ClWorkloads/ClPermuteWorkload.hpp b/src/backends/cl/workloads/ClPermuteWorkload.hpp
index a1f3161921..8ff5707ad6 100644
--- a/src/backends/ClWorkloads/ClPermuteWorkload.hpp
+++ b/src/backends/cl/workloads/ClPermuteWorkload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 #include <armnn/TypesUtils.hpp>
 #include <arm_compute/runtime/CL/functions/CLPermute.h>
diff --git a/src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp b/src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp
index 57b056a05c..98911856fe 100644
--- a/src/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp
+++ b/src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClPooling2dBaseWorkload.hpp"
-#include <backends/ClLayerSupport.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
diff --git a/src/backends/ClWorkloads/ClPooling2dBaseWorkload.hpp b/src/backends/cl/workloads/ClPooling2dBaseWorkload.hpp
index ea7ddfb41b..8f9db08ddc 100644
--- a/src/backends/ClWorkloads/ClPooling2dBaseWorkload.hpp
+++ b/src/backends/cl/workloads/ClPooling2dBaseWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
@@ -23,7 +23,7 @@ class ClPooling2dBaseWorkload : public TypedWorkload<Pooling2dQueueDescriptor, d
 public:
     using TypedWorkload<Pooling2dQueueDescriptor, dataTypes...>::m_Data;
 
-    ClPooling2dBaseWorkload(const Pooling2dQueueDescriptor& descriptor, const WorkloadInfo& info, 
+    ClPooling2dBaseWorkload(const Pooling2dQueueDescriptor& descriptor, const WorkloadInfo& info,
                             const std::string& name);
 
 protected:
diff --git a/src/backends/ClWorkloads/ClPooling2dFloatWorkload.cpp b/src/backends/cl/workloads/ClPooling2dFloatWorkload.cpp
index dc9d17f0ae..dc9d17f0ae 100644
--- a/src/backends/ClWorkloads/ClPooling2dFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClPooling2dFloatWorkload.cpp
diff --git a/src/backends/ClWorkloads/ClPooling2dFloatWorkload.hpp b/src/backends/cl/workloads/ClPooling2dFloatWorkload.hpp
index 71648d40f4..ba9294c40f 100644
--- a/src/backends/ClWorkloads/ClPooling2dFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClPooling2dFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include "ClPooling2dBaseWorkload.hpp"
 
diff --git a/src/backends/ClWorkloads/ClPooling2dUint8Workload.cpp b/src/backends/cl/workloads/ClPooling2dUint8Workload.cpp
index 0b4b15f806..0b4b15f806 100644
--- a/src/backends/ClWorkloads/ClPooling2dUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClPooling2dUint8Workload.cpp
diff --git a/src/backends/ClWorkloads/ClPooling2dUint8Workload.hpp b/src/backends/cl/workloads/ClPooling2dUint8Workload.hpp
index 2baf2aa708..b07f955343 100644
--- a/src/backends/ClWorkloads/ClPooling2dUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClPooling2dUint8Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include "ClPooling2dBaseWorkload.hpp"
 
diff --git a/src/backends/ClWorkloads/ClReshapeFloatWorkload.cpp b/src/backends/cl/workloads/ClReshapeFloatWorkload.cpp
index ea50436a66..4da3bbd703 100644
--- a/src/backends/ClWorkloads/ClReshapeFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClReshapeFloatWorkload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClReshapeFloatWorkload.hpp"
-#include "backends/ClTensorHandle.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClReshapeFloatWorkload.hpp b/src/backends/cl/workloads/ClReshapeFloatWorkload.hpp
index 48265143e5..e5fc20ec8b 100644
--- a/src/backends/ClWorkloads/ClReshapeFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClReshapeFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClReshapeUint8Workload.cpp b/src/backends/cl/workloads/ClReshapeUint8Workload.cpp
index 82bd93ef9c..8fbee151fc 100644
--- a/src/backends/ClWorkloads/ClReshapeUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClReshapeUint8Workload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClReshapeUint8Workload.hpp"
-#include "backends/ClTensorHandle.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClReshapeUint8Workload.hpp b/src/backends/cl/workloads/ClReshapeUint8Workload.hpp
index c9801a3ae1..654437a4c1 100644
--- a/src/backends/ClWorkloads/ClReshapeUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClReshapeUint8Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.cpp
index 7c05bbf33d..499466e959 100644
--- a/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.cpp
@@ -4,9 +4,9 @@
 //
 
 #include "ClResizeBilinearFloatWorkload.hpp"
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 
 #include "ClWorkloadUtils.hpp"
diff --git a/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.hpp b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.hpp
index f2ee67f5dd..f29f416907 100644
--- a/src/backends/ClWorkloads/ClResizeBilinearFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClResizeBilinearFloatWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp
index eb05a19670..eb05a19670 100644
--- a/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.cpp
+++ b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp
diff --git a/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.hpp
index b800056cdf..b800056cdf 100644
--- a/src/backends/ClWorkloads/ClSoftmaxBaseWorkload.hpp
+++ b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.hpp
diff --git a/src/backends/ClWorkloads/ClSoftmaxFloatWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp
index c34b5a2a74..606005659f 100644
--- a/src/backends/ClWorkloads/ClSoftmaxFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClSoftmaxFloatWorkload.hpp"
-#include "backends/ClTensorHandle.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClSoftmaxFloatWorkload.hpp b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp
index 965b845cf8..b400b3c7ea 100644
--- a/src/backends/ClWorkloads/ClSoftmaxFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
-#include "arm_compute/runtime/MemoryManagerOnDemand.h"
+#include <arm_compute/runtime/MemoryManagerOnDemand.h>
 
 #include <memory>
 
diff --git a/src/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp b/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp
index 1bb9628d74..7e0589e89f 100644
--- a/src/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "ClSoftmaxUint8Workload.hpp"
-#include "backends/ClTensorHandle.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/cl/ClTensorHandle.hpp>
+#include <backends/CpuTensorHandle.hpp>
 
 #include "ClWorkloadUtils.hpp"
 
diff --git a/src/backends/ClWorkloads/ClSoftmaxUint8Workload.hpp b/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp
index 29427a5976..4786faf60b 100644
--- a/src/backends/ClWorkloads/ClSoftmaxUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 #include "arm_compute/runtime/MemoryManagerOnDemand.h"
diff --git a/src/backends/ClWorkloads/ClSplitterFloatWorkload.cpp b/src/backends/cl/workloads/ClSplitterFloatWorkload.cpp
index 5fd634bdb6..5fd634bdb6 100644
--- a/src/backends/ClWorkloads/ClSplitterFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClSplitterFloatWorkload.cpp
diff --git a/src/backends/ClWorkloads/ClSplitterFloatWorkload.hpp b/src/backends/cl/workloads/ClSplitterFloatWorkload.hpp
index a0b5846f8e..a0b5846f8e 100644
--- a/src/backends/ClWorkloads/ClSplitterFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClSplitterFloatWorkload.hpp
diff --git a/src/backends/ClWorkloads/ClSplitterUint8Workload.cpp b/src/backends/cl/workloads/ClSplitterUint8Workload.cpp
index 50a251ada7..50a251ada7 100644
--- a/src/backends/ClWorkloads/ClSplitterUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClSplitterUint8Workload.cpp
diff --git a/src/backends/ClWorkloads/ClSplitterUint8Workload.hpp b/src/backends/cl/workloads/ClSplitterUint8Workload.hpp
index 19e8be5034..19e8be5034 100644
--- a/src/backends/ClWorkloads/ClSplitterUint8Workload.hpp
+++ b/src/backends/cl/workloads/ClSplitterUint8Workload.hpp
diff --git a/src/backends/ClWorkloads/ClSubtractionWorkload.cpp b/src/backends/cl/workloads/ClSubtractionWorkload.cpp
index e5d5702389..37b334d94e 100644
--- a/src/backends/ClWorkloads/ClSubtractionWorkload.cpp
+++ b/src/backends/cl/workloads/ClSubtractionWorkload.cpp
@@ -5,7 +5,7 @@
 
 #include "ClSubtractionWorkload.hpp"
 
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
diff --git a/src/backends/ClWorkloads/ClSubtractionWorkload.hpp b/src/backends/cl/workloads/ClSubtractionWorkload.hpp
index 59a5f01e73..67b219b09d 100644
--- a/src/backends/ClWorkloads/ClSubtractionWorkload.hpp
+++ b/src/backends/cl/workloads/ClSubtractionWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
diff --git a/src/backends/ClWorkloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp
index 3a8ff00bb6..3a8ff00bb6 100644
--- a/src/backends/ClWorkloads/ClWorkloadUtils.hpp
+++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp
diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp
new file mode 100644
index 0000000000..3329f42e08
--- /dev/null
+++ b/src/backends/cl/workloads/ClWorkloads.hpp
@@ -0,0 +1,41 @@
+//
+// Copyright © 2017 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+#include "ClActivationFloatWorkload.hpp"
+#include "ClActivationUint8Workload.hpp"
+#include "ClAdditionWorkload.hpp"
+#include "ClBaseConstantWorkload.hpp"
+#include "ClBaseMergerWorkload.hpp"
+#include "ClBatchNormalizationFloatWorkload.hpp"
+#include "ClConstantFloatWorkload.hpp"
+#include "ClConstantUint8Workload.hpp"
+#include "ClConvolution2dFloatWorkload.hpp"
+#include "ClConvolution2dUint8Workload.hpp"
+#include "ClDepthwiseConvolutionFloatWorkload.hpp"
+#include "ClDepthwiseConvolutionUint8Workload.hpp"
+#include "ClDivisionFloatWorkload.hpp"
+#include "ClFloorFloatWorkload.hpp"
+#include "ClFullyConnectedWorkload.hpp"
+#include "ClL2NormalizationFloatWorkload.hpp"
+#include "ClLstmFloatWorkload.hpp"
+#include "ClMergerFloatWorkload.hpp"
+#include "ClMergerUint8Workload.hpp"
+#include "ClMultiplicationFloatWorkload.hpp"
+#include "ClNormalizationFloatWorkload.hpp"
+#include "ClPermuteWorkload.hpp"
+#include "ClPadWorkload.hpp"
+#include "ClPooling2dFloatWorkload.hpp"
+#include "ClPooling2dUint8Workload.hpp"
+#include "ClReshapeFloatWorkload.hpp"
+#include "ClReshapeUint8Workload.hpp"
+#include "ClResizeBilinearFloatWorkload.hpp"
+#include "ClSoftmaxFloatWorkload.hpp"
+#include "ClSoftmaxUint8Workload.hpp"
+#include "ClSplitterFloatWorkload.hpp"
+#include "ClSplitterUint8Workload.hpp"
+#include "ClSubtractionWorkload.hpp"
+#include "ClConvertFp16ToFp32Workload.hpp"
+#include "ClConvertFp32ToFp16Workload.hpp"
diff --git a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp
index 86ec31c71d..84e341fe64 100644
--- a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp
+++ b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp
@@ -4,10 +4,10 @@
 //
 
 #include "NeonConvertFp16ToFp32Workload.hpp"
-#include "Half.hpp"
-#include "FloatingPointConverter.hpp"
+#include <Half.hpp>
+#include <FloatingPointConverter.hpp>
 
-#include "backends/WorkloadUtils.hpp"
+#include <backends/WorkloadUtils.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp
index 0f4fbe4e93..261de3d0ce 100644
--- a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp
+++ b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp
@@ -5,11 +5,11 @@
 
 #include "NeonConvertFp32ToFp16Workload.hpp"
 
-#include "Half.hpp"
-#include "FloatingPointConverter.hpp"
+#include <Half.hpp>
+#include <FloatingPointConverter.hpp>
 
-#include "Profiling.hpp"
-#include "backends/WorkloadUtils.hpp"
+#include <Profiling.hpp>
+#include <backends/WorkloadUtils.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/Merger.hpp b/src/backends/reference/workloads/Merger.hpp
index 867925faa2..61c1311905 100644
--- a/src/backends/reference/workloads/Merger.hpp
+++ b/src/backends/reference/workloads/Merger.hpp
@@ -7,8 +7,7 @@
 
 #include "RefWorkloadUtils.hpp"
 
-#include "backends/WorkloadData.hpp"
-
+#include <backends/WorkloadData.hpp>
 #include <armnn/Tensor.hpp>
 
 namespace armnn
diff --git a/src/backends/reference/workloads/RefActivationFloat32Workload.hpp b/src/backends/reference/workloads/RefActivationFloat32Workload.hpp
index 0de33f02ff..73be6b05bd 100644
--- a/src/backends/reference/workloads/RefActivationFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefActivationFloat32Workload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefActivationUint8Workload.hpp b/src/backends/reference/workloads/RefActivationUint8Workload.hpp
index f38888a9f7..4b8cc1a418 100644
--- a/src/backends/reference/workloads/RefActivationUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefActivationUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefArithmeticWorkload.hpp b/src/backends/reference/workloads/RefArithmeticWorkload.hpp
index 7197b7a883..be89a3222f 100644
--- a/src/backends/reference/workloads/RefArithmeticWorkload.hpp
+++ b/src/backends/reference/workloads/RefArithmeticWorkload.hpp
@@ -6,9 +6,9 @@
 #pragma once
 
 #include <armnn/Types.hpp>
-#include "backends/StringMapping.hpp"
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/StringMapping.hpp>
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefBaseConstantWorkload.hpp b/src/backends/reference/workloads/RefBaseConstantWorkload.hpp
index 8dc9fd6104..9d125e422d 100644
--- a/src/backends/reference/workloads/RefBaseConstantWorkload.hpp
+++ b/src/backends/reference/workloads/RefBaseConstantWorkload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 #include <armnn/Types.hpp>
 
diff --git a/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp
index 15c843c2ca..17f80ca5e0 100644
--- a/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefBatchNormalizationFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp
index d3e8e0a120..854ba1aea5 100644
--- a/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefBatchNormalizationUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp
index 5e841ba34f..475b47f901 100644
--- a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp
+++ b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp
index 0754fd5c79..2d5560933d 100644
--- a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp
+++ b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp
index 34489e807c..4f2700d22e 100644
--- a/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefConvolution2dFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp b/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp
index 0e2dd6aada..bbd77cebc4 100644
--- a/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefConvolution2dUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp
index 8f1227e2de..516d80941f 100644
--- a/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp
index c615cf7880..3cb82c4be5 100644
--- a/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp
index 523fdcff50..89a907b8b8 100644
--- a/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefFloorFloat32Workload.hpp b/src/backends/reference/workloads/RefFloorFloat32Workload.hpp
index d7cfa50365..ffc4541a85 100644
--- a/src/backends/reference/workloads/RefFloorFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefFloorFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp
index ce058690ac..c296f99e1c 100644
--- a/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefFullyConnectedFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp
index e489cc7d81..3a15d9913a 100644
--- a/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefFullyConnectedUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp
index a3f03f3060..67055a9c37 100644
--- a/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefLstmFloat32Workload.hpp b/src/backends/reference/workloads/RefLstmFloat32Workload.hpp
index fc4f7776c6..79781c6971 100644
--- a/src/backends/reference/workloads/RefLstmFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefLstmFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefMergerFloat32Workload.hpp b/src/backends/reference/workloads/RefMergerFloat32Workload.hpp
index 23a523c852..0c659231d2 100644
--- a/src/backends/reference/workloads/RefMergerFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefMergerFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefMergerUint8Workload.hpp b/src/backends/reference/workloads/RefMergerUint8Workload.hpp
index 65dc42120a..f19bd22cb1 100644
--- a/src/backends/reference/workloads/RefMergerUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefMergerUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp b/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp
index e30356c422..2358c60aec 100644
--- a/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefNormalizationFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefPermuteWorkload.hpp b/src/backends/reference/workloads/RefPermuteWorkload.hpp
index d72cf77e74..2cc176d205 100644
--- a/src/backends/reference/workloads/RefPermuteWorkload.hpp
+++ b/src/backends/reference/workloads/RefPermuteWorkload.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
+#include <backends/Workload.hpp>
 
 #include <armnn/TypesUtils.hpp>
 
diff --git a/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp b/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp
index 501fb71aff..6387cb25c5 100644
--- a/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefPooling2dFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp b/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp
index 6544f9a785..3802051015 100644
--- a/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefPooling2dUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp b/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp
index 9281e89cf7..62de71a74b 100644
--- a/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefReshapeFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefReshapeUint8Workload.hpp b/src/backends/reference/workloads/RefReshapeUint8Workload.hpp
index b37fb4bdeb..25d1001d70 100644
--- a/src/backends/reference/workloads/RefReshapeUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefReshapeUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp
index 0fff7ee695..1a8b5ba8a5 100644
--- a/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefResizeBilinearFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp
index bbaf899ca6..50a0c50a83 100644
--- a/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefResizeBilinearUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp
index d37f2b5990..8af0cc51e7 100644
--- a/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefSoftmaxFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp b/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp
index b179d529da..fe6a0d1a82 100644
--- a/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefSoftmaxUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp b/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp
index 12176dd277..5d6ef653c1 100644
--- a/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp
+++ b/src/backends/reference/workloads/RefSplitterFloat32Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefSplitterUint8Workload.hpp b/src/backends/reference/workloads/RefSplitterUint8Workload.hpp
index e80cb1a654..5dac92a73b 100644
--- a/src/backends/reference/workloads/RefSplitterUint8Workload.hpp
+++ b/src/backends/reference/workloads/RefSplitterUint8Workload.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "backends/Workload.hpp"
-#include "backends/WorkloadData.hpp"
+#include <backends/Workload.hpp>
+#include <backends/WorkloadData.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/RefWorkloadUtils.hpp b/src/backends/reference/workloads/RefWorkloadUtils.hpp
index 616a875028..153c519350 100644
--- a/src/backends/reference/workloads/RefWorkloadUtils.hpp
+++ b/src/backends/reference/workloads/RefWorkloadUtils.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
 #include <armnn/Tensor.hpp>
 #include <armnn/Types.hpp>
diff --git a/src/backends/reference/workloads/Splitter.hpp b/src/backends/reference/workloads/Splitter.hpp
index e9c0379c9e..4d6f673359 100644
--- a/src/backends/reference/workloads/Splitter.hpp
+++ b/src/backends/reference/workloads/Splitter.hpp
@@ -7,8 +7,7 @@
 
 #include "RefWorkloadUtils.hpp"
 
-#include "backends/WorkloadData.hpp"
-
+#include <backends/WorkloadData.hpp>
 #include <armnn/Tensor.hpp>
 
 #include <boost/assert.hpp>
diff --git a/src/backends/test/ActivationTestImpl.hpp b/src/backends/test/ActivationTestImpl.hpp
index a5d327c287..e7d3d6a9c1 100644
--- a/src/backends/test/ActivationTestImpl.hpp
+++ b/src/backends/test/ActivationTestImpl.hpp
@@ -9,11 +9,11 @@
 #include <armnn/TypesUtils.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 #include "ActivationFixture.hpp"
 
 #include <algorithm>
@@ -122,7 +122,7 @@ LayerTestResult<float, 4> BoundedReLuUpperBoundOnlyTest(armnn::IWorkloadFactory&
      0.999f,       1.2f,    0.89f,       6.1f,
     };
 
-    // Calculated manually. 
+    // Calculated manually.
     std::vector<float> output = std::vector<float>{
        0.0f,       0.1f,     0.5f,       6.0f,
      0.786f,    5.9875f,     0.0f,     0.384f,
@@ -147,7 +147,7 @@ LayerTestResult<uint8_t, 4> BoundedReLuUint8UpperBoundOnlyTest(armnn::IWorkloadF
         251,   8, 92
     };
 
-    // Calculated manually. 
+    // Calculated manually.
     std::vector<uint8_t> output = std::vector<uint8_t>{
           0, 122,  0,
         255,   0, 58
diff --git a/src/backends/test/ArmComputeCl.cpp b/src/backends/test/ArmComputeCl.cpp
index 5ff94c1056..4f1a84dfad 100644
--- a/src/backends/test/ArmComputeCl.cpp
+++ b/src/backends/test/ArmComputeCl.cpp
@@ -7,10 +7,10 @@
 #include "LayerTests.hpp"
 
 #include <backends/CpuTensorHandle.hpp>
-#include <backends/ClWorkloadFactory.hpp>
-#include <backends/ClWorkloads/ClWorkloadUtils.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
+#include <backends/cl/workloads/ClWorkloadUtils.hpp>
 #include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/ClLayerSupport.hpp>
+#include <backends/cl/ClLayerSupport.hpp>
 #include "ActivationFixture.hpp"
 #include "ClContextControlFixture.hpp"
 
diff --git a/src/backends/test/BatchNormTestImpl.hpp b/src/backends/test/BatchNormTestImpl.hpp
index 7126db9074..35f4e4c89c 100644
--- a/src/backends/test/BatchNormTestImpl.hpp
+++ b/src/backends/test/BatchNormTestImpl.hpp
@@ -8,12 +8,12 @@
 #include <armnn/Tensor.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 
 
 template<typename T>
diff --git a/src/backends/test/ClContextControlFixture.hpp b/src/backends/test/ClContextControlFixture.hpp
index 54c5a4f505..c81428ff82 100644
--- a/src/backends/test/ClContextControlFixture.hpp
+++ b/src/backends/test/ClContextControlFixture.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "backends/ClContextControl.hpp"
+#include <backends/cl/ClContextControl.hpp>
 
 template<bool ProfilingEnabled>
 struct ClContextControlFixtureBase
diff --git a/src/backends/test/Conv2dTestImpl.hpp b/src/backends/test/Conv2dTestImpl.hpp
index eb7165bf09..ce193659a1 100644
--- a/src/backends/test/Conv2dTestImpl.hpp
+++ b/src/backends/test/Conv2dTestImpl.hpp
@@ -9,11 +9,11 @@
 #include <armnn/TypesUtils.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 // Mapping from input type to bias type for fully connected layers.
 // float => float, uint8_t => int32_t
diff --git a/src/backends/test/CreateWorkloadCl.cpp b/src/backends/test/CreateWorkloadCl.cpp
index cc0e12d202..078ef8c52d 100644
--- a/src/backends/test/CreateWorkloadCl.cpp
+++ b/src/backends/test/CreateWorkloadCl.cpp
@@ -2,15 +2,15 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/MemCopyWorkload.hpp>
-#include <backends/ClWorkloads/ClWorkloadUtils.hpp>
-#include <backends/ClWorkloads.hpp>
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/workloads/ClWorkloadUtils.hpp>
+#include <backends/cl/workloads/ClWorkloads.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include "ClContextControlFixture.hpp"
 
-#include "test/CreateWorkloadClNeon.hpp"
+#include <test/CreateWorkloadClNeon.hpp>
 
 boost::test_tools::predicate_result CompareIClTensorHandleShape(IClTensorHandle*                    tensorHandle,
                                                                 std::initializer_list<unsigned int> expectedDimensions)
diff --git a/src/backends/test/IsLayerSupportedTest.cpp b/src/backends/test/IsLayerSupportedTest.cpp
index 7117e20db5..089822dade 100644
--- a/src/backends/test/IsLayerSupportedTest.cpp
+++ b/src/backends/test/IsLayerSupportedTest.cpp
@@ -4,7 +4,7 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "LayerTests.hpp"
 
 #include <backends/CpuTensorHandle.hpp>
@@ -13,13 +13,13 @@
 
 #include <string>
 #include <iostream>
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 #include "IsLayerSupportedTestImpl.hpp"
-#include "ClContextControlFixture.hpp"
+#include <backends/test/ClContextControlFixture.hpp>
 
-#include "layers/ConvertFp16ToFp32Layer.hpp"
-#include "layers/ConvertFp32ToFp16Layer.hpp"
+#include <layers/ConvertFp16ToFp32Layer.hpp>
+#include <layers/ConvertFp32ToFp16Layer.hpp>
 
 BOOST_AUTO_TEST_SUITE(IsLayerSupported)
 
diff --git a/src/backends/test/LayerReleaseConstantDataTest.cpp b/src/backends/test/LayerReleaseConstantDataTest.cpp
index 7566c72352..7549dfd5f8 100644
--- a/src/backends/test/LayerReleaseConstantDataTest.cpp
+++ b/src/backends/test/LayerReleaseConstantDataTest.cpp
@@ -6,13 +6,13 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/cast.hpp>
 
-#include "backends/WorkloadData.hpp"
-#include "Graph.hpp"
+#include <backends/WorkloadData.hpp>
+#include <Graph.hpp>
 
 #include <utility>
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/ClWorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 using namespace armnn;
 using namespace std;
diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp
index 4f6cb93670..55f4a5c5f9 100644
--- a/src/backends/test/LayerTests.cpp
+++ b/src/backends/test/LayerTests.cpp
@@ -17,7 +17,7 @@
 #include <backends/WorkloadFactory.hpp>
 
 #ifdef ARMCOMPUTECL_ENABLED
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 #endif
 
diff --git a/src/backends/test/LstmTestImpl.hpp b/src/backends/test/LstmTestImpl.hpp
index 2c4e166084..7d57c86a67 100644
--- a/src/backends/test/LstmTestImpl.hpp
+++ b/src/backends/test/LstmTestImpl.hpp
@@ -8,12 +8,12 @@
 #include <armnn/Tensor.hpp>
 #include <armnn/TypesUtils.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 #include <backends/WorkloadInfo.hpp>
-#include "backends/WorkloadFactory.hpp"
+#include <backends/WorkloadFactory.hpp>
 
 LayerTestResult<float, 2> LstmNoCifgNoPeepholeNoProjectionTestImpl(armnn::IWorkloadFactory& workloadFactory,
                                                                    const boost::multi_array<float, 2>& input,
@@ -283,7 +283,7 @@ LstmLayerFloat32NoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory
     AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get());
     AddInputToWorkload(data, info, outputStateInTensorInfo, outputStateInHandle.get());
     AddInputToWorkload(data, info, cellStateInTensorInfo, cellStateInHandle.get());
-    
+
     AddOutputToWorkload(data, info, scratchBufferTensorInfo, scratchHandle.get());
     AddOutputToWorkload(data, info, outputStateOutTensorInfo, outputStateOutHandle.get());
     AddOutputToWorkload(data, info, cellStateOutTensorInfo, cellStateOutHandle.get());
diff --git a/src/backends/test/MemCopyTests.cpp b/src/backends/test/MemCopyTests.cpp
index a1dc34a6ec..f66caffd92 100644
--- a/src/backends/test/MemCopyTests.cpp
+++ b/src/backends/test/MemCopyTests.cpp
@@ -8,13 +8,13 @@
 #include <armnn/ArmNN.hpp>
 #include <backends/reference/RefWorkloadFactory.hpp>
 #if ARMCOMPUTECL_ENABLED
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 #endif
 #if ARMCOMPUTENEON_ENABLED
 #include <backends/neon/NeonWorkloadFactory.hpp>
 #endif
 #include <backends/CpuTensorHandle.hpp>
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 
 #include "TensorCopyUtils.hpp"
 #include "WorkloadTestUtils.hpp"
diff --git a/src/backends/test/NormTestImpl.hpp b/src/backends/test/NormTestImpl.hpp
index 2690313655..dfa2f7072e 100644
--- a/src/backends/test/NormTestImpl.hpp
+++ b/src/backends/test/NormTestImpl.hpp
@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "armnn/Exceptions.hpp"
-#include "armnn/LayerSupport.hpp"
+#include <armnn/Exceptions.hpp>
+#include <armnn/LayerSupport.hpp>
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 LayerTestResult<float,4> SimpleNormalizationTestImpl(armnn::IWorkloadFactory& workloadFactory,
                                                      armnn::NormalizationAlgorithmChannel normChannel,
diff --git a/src/backends/test/PermuteTestImpl.hpp b/src/backends/test/PermuteTestImpl.hpp
index b49c539b2e..2caf2c8d2b 100644
--- a/src/backends/test/PermuteTestImpl.hpp
+++ b/src/backends/test/PermuteTestImpl.hpp
@@ -9,11 +9,11 @@
 #include <armnn/TypesUtils.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 template<typename T>
 LayerTestResult<T, 4> SimplePermuteTestImpl(
diff --git a/src/backends/test/Pooling2dTestImpl.hpp b/src/backends/test/Pooling2dTestImpl.hpp
index e8c7e86e9d..4c69fb9f46 100644
--- a/src/backends/test/Pooling2dTestImpl.hpp
+++ b/src/backends/test/Pooling2dTestImpl.hpp
@@ -9,11 +9,11 @@
 #include <armnn/TypesUtils.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 #include <algorithm>
 
diff --git a/src/backends/test/ReshapeTestImpl.hpp b/src/backends/test/ReshapeTestImpl.hpp
index 5d32d9d3a6..cbd3b58798 100644
--- a/src/backends/test/ReshapeTestImpl.hpp
+++ b/src/backends/test/ReshapeTestImpl.hpp
@@ -9,11 +9,11 @@
 #include <armnn/TypesUtils.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 template<typename T>
 LayerTestResult<T, 4> SimpleReshapeTestImpl(
diff --git a/src/backends/test/SoftmaxTestImpl.hpp b/src/backends/test/SoftmaxTestImpl.hpp
index 5bc13fa21c..7ca5f70e85 100644
--- a/src/backends/test/SoftmaxTestImpl.hpp
+++ b/src/backends/test/SoftmaxTestImpl.hpp
@@ -9,11 +9,11 @@
 #include <armnn/TypesUtils.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 #include "QuantizeHelper.hpp"
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
 #include <algorithm>
 
diff --git a/src/backends/test/SplitterTestImpl.hpp b/src/backends/test/SplitterTestImpl.hpp
index 5dcc412d0e..4578ce5792 100644
--- a/src/backends/test/SplitterTestImpl.hpp
+++ b/src/backends/test/SplitterTestImpl.hpp
@@ -8,12 +8,12 @@
 #include <armnn/Tensor.hpp>
 #include <backends/WorkloadInfo.hpp>
 
-#include "test/TensorHelpers.hpp"
+#include <test/TensorHelpers.hpp>
 
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/WorkloadFactory.hpp"
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/WorkloadFactory.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 
 
 template<typename T>
diff --git a/src/backends/test/TensorCopyUtils.cpp b/src/backends/test/TensorCopyUtils.cpp
index b2a9efc01e..e92469aaa3 100644
--- a/src/backends/test/TensorCopyUtils.cpp
+++ b/src/backends/test/TensorCopyUtils.cpp
@@ -11,7 +11,7 @@
 #include "TensorCopyUtils.hpp"
 
 #ifdef ARMCOMPUTECL_ENABLED
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #endif
 
 #if ARMCOMPUTENEON_ENABLED
@@ -22,7 +22,7 @@
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 #endif
 
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
 void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* mem)
 {
diff --git a/src/backends/test/TensorCopyUtils.hpp b/src/backends/test/TensorCopyUtils.hpp
index 0cec839903..4a3ba64239 100644
--- a/src/backends/test/TensorCopyUtils.hpp
+++ b/src/backends/test/TensorCopyUtils.hpp
@@ -4,8 +4,8 @@
 //
 #pragma once
 
-#include "armnn/Tensor.hpp"
-#include "backends/ITensorHandle.hpp"
+#include <armnn/Tensor.hpp>
+#include <backends/ITensorHandle.hpp>
 
 void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* mem);
author	David Beck <david.beck@arm.com>	2018-09-26 17:41:13 +0100
committer	Matthew Bentham <matthew.bentham@arm.com>	2018-10-10 16:16:57 +0100
commit	ac42efd972b7d03da17f057b2ceaaac5d6e96b1a (patch)
tree	1ebc1320fa3ea7f494d3716ea79a2bda0f4ffd1e
parent	bcd3c85b5a7657b38f503676b88a80ae74165acd (diff)
download	armnn-ac42efd972b7d03da17f057b2ceaaac5d6e96b1a.tar.gz