From 0f402c46900f443cb815ef5fd53c2c426d04638d Mon Sep 17 00:00:00 2001
From: Thivya Ashokkumar <thivyaak@amazon.com>
Date: Sat, 2 Dec 2023 21:51:28 -0800
Subject: [PATCH] ICDHandler initialization

---
 src/app/icd/BUILD.gn                    | 16 ----------------
 src/app/icd/client/BUILD.gn             | 14 ++++++++++++++
 src/app/icd/{ => client}/ICDHandler.cpp |  0
 src/app/icd/{ => client}/ICDHandler.h   |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)
 rename src/app/icd/{ => client}/ICDHandler.cpp (100%)
 rename src/app/icd/{ => client}/ICDHandler.h (98%)

diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn
index b64a0d7ecee767..7fdada476e989c 100644
--- a/src/app/icd/BUILD.gn
+++ b/src/app/icd/BUILD.gn
@@ -110,19 +110,3 @@ source_set("configuration-data") {
 
   deps = [ "${chip_root}/src/lib/core" ]
 }
-
-# ICD Handler source-set is broken out of the main source-set to enable unit tests
-# All sources and configurations used by the ICDHandler need to go in this source-set
-source_set("handler") {
-  sources = [
-    "ICDHandler.cpp",
-    "ICDHandler.h",
-  ]
-
-  public_deps = [
-    "${chip_root}/src/app/icd/client:manager",
-    "${chip_root}/src/lib/core",
-    "${chip_root}/src/messaging",
-    "${chip_root}/src/protocols",
-  ]
-}
diff --git a/src/app/icd/client/BUILD.gn b/src/app/icd/client/BUILD.gn
index f5cddf72f3575a..8f3c8e33d34bbf 100644
--- a/src/app/icd/client/BUILD.gn
+++ b/src/app/icd/client/BUILD.gn
@@ -31,3 +31,17 @@ source_set("manager") {
     "${chip_root}/src/protocols",
   ]
 }
+# ICD Handler source-set is broken out of the main source-set to enable unit tests
+# All sources and configurations used by the ICDHandler need to go in this source-set
+source_set("handler") {
+  sources = [
+    "ICDHandler.cpp",
+    "ICDHandler.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/messaging",
+    "${chip_root}/src/protocols",
+  ]
+}
\ No newline at end of file
diff --git a/src/app/icd/ICDHandler.cpp b/src/app/icd/client/ICDHandler.cpp
similarity index 100%
rename from src/app/icd/ICDHandler.cpp
rename to src/app/icd/client/ICDHandler.cpp
diff --git a/src/app/icd/ICDHandler.h b/src/app/icd/client/ICDHandler.h
similarity index 98%
rename from src/app/icd/ICDHandler.h
rename to src/app/icd/client/ICDHandler.h
index c8e20af578bd1d..275d2edba17218 100644
--- a/src/app/icd/ICDHandler.h
+++ b/src/app/icd/client/ICDHandler.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <client/DefaultICDClientStorage.h>
+#include <DefaultICDClientStorage.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <messaging/ExchangeContext.h>
 #include <messaging/ExchangeMgr.h>