diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
index f6790b5..cb2be38 100644
--- a/deployments/component-test/component-test.cmake
+++ b/deployments/component-test/component-test.cmake
@@ -68,8 +68,8 @@
 		"components/service/attestation/test/component"
 		"components/service/attestation/test/service"
 		"components/service/crypto/client/cpp"
-		"components/service/crypto/client/cpp/protobuf"
-		"components/service/crypto/client/cpp/packed-c"
+		"components/service/crypto/client/cpp/protocol/protobuf"
+		"components/service/crypto/client/cpp/protocol/packed-c"
 		"components/service/crypto/client/test"
 		"components/service/crypto/client/test/standalone"
 		"components/service/crypto/provider"
diff --git a/deployments/libts/linux-pc/CMakeLists.txt b/deployments/libts/linux-pc/CMakeLists.txt
index 3aa69ae..bd96394 100644
--- a/deployments/libts/linux-pc/CMakeLists.txt
+++ b/deployments/libts/linux-pc/CMakeLists.txt
@@ -143,8 +143,8 @@
 		"components/service/crypto/test/service/protobuf"
 		"components/service/crypto/test/service/packed-c"
 		"components/service/crypto/client/cpp"
-		"components/service/crypto/client/cpp/protobuf"
-		"components/service/crypto/client/cpp/packed-c"
+		"components/service/crypto/client/cpp/protocol/protobuf"
+		"components/service/crypto/client/cpp/protocol/packed-c"
 		"components/service/common/serializer/protobuf"
 		"components/service/common/client"
 		"protocols/service/crypto/protobuf"
diff --git a/deployments/ts-demo/ts-demo.cmake b/deployments/ts-demo/ts-demo.cmake
index 3231eb6..8f934a7 100644
--- a/deployments/ts-demo/ts-demo.cmake
+++ b/deployments/ts-demo/ts-demo.cmake
@@ -40,7 +40,7 @@
 		"components/service/common/include"
 		"components/service/common/client"
 		"components/service/crypto/client/cpp"
-		"components/service/crypto/client/cpp/packed-c"
+		"components/service/crypto/client/cpp/protocol/packed-c"
 		"protocols/service/crypto/packed-c"
 )
 
diff --git a/deployments/ts-demo/ts-demo.cpp b/deployments/ts-demo/ts-demo.cpp
index 2f607e6..7ccd7dd 100644
--- a/deployments/ts-demo/ts-demo.cpp
+++ b/deployments/ts-demo/ts-demo.cpp
@@ -3,7 +3,7 @@
  * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
  */
 
-#include <service/crypto/client/cpp/packed-c/packedc_crypto_client.h>
+#include <service/crypto/client/cpp/protocol/packed-c/packedc_crypto_client.h>
 #include <protocols/rpc/common/packed-c/encoding.h>
 #include <app/ts-demo/ts-demo.h>
 #include <service_locator.h>
diff --git a/deployments/ts-service-test/ts-service-test.cmake b/deployments/ts-service-test/ts-service-test.cmake
index dfe0bb1..c756687 100644
--- a/deployments/ts-service-test/ts-service-test.cmake
+++ b/deployments/ts-service-test/ts-service-test.cmake
@@ -39,8 +39,8 @@
 		"components/service/crypto/test/service/psa_crypto_api"
 		"components/service/crypto/client/psa"
 		"components/service/crypto/client/cpp"
-		"components/service/crypto/client/cpp/protobuf"
-		"components/service/crypto/client/cpp/packed-c"
+		"components/service/crypto/client/cpp/protocol/protobuf"
+		"components/service/crypto/client/cpp/protocol/packed-c"
 		"components/service/common/serializer/protobuf"
 		"components/service/attestation/include"
 		"components/service/attestation/client/psa"