diff --git a/samples/net/wifi/CMakeLists.txt b/samples/net/wifi/shell/CMakeLists.txt
similarity index 100%
rename from samples/net/wifi/CMakeLists.txt
rename to samples/net/wifi/shell/CMakeLists.txt
diff --git a/samples/net/wifi/README.rst b/samples/net/wifi/shell/README.rst
similarity index 100%
rename from samples/net/wifi/README.rst
rename to samples/net/wifi/shell/README.rst
diff --git a/samples/net/wifi/boards/cc3220sf_launchxl.conf b/samples/net/wifi/shell/boards/cc3220sf_launchxl.conf
similarity index 100%
rename from samples/net/wifi/boards/cc3220sf_launchxl.conf
rename to samples/net/wifi/shell/boards/cc3220sf_launchxl.conf
diff --git a/samples/net/wifi/boards/cc3235sf_launchxl.conf b/samples/net/wifi/shell/boards/cc3235sf_launchxl.conf
similarity index 100%
rename from samples/net/wifi/boards/cc3235sf_launchxl.conf
rename to samples/net/wifi/shell/boards/cc3235sf_launchxl.conf
diff --git a/samples/net/wifi/boards/cy8cproto_062_4343w.conf b/samples/net/wifi/shell/boards/cy8cproto_062_4343w.conf
similarity index 100%
rename from samples/net/wifi/boards/cy8cproto_062_4343w.conf
rename to samples/net/wifi/shell/boards/cy8cproto_062_4343w.conf
diff --git a/samples/net/wifi/boards/frdm_rw612.conf b/samples/net/wifi/shell/boards/frdm_rw612.conf
similarity index 100%
rename from samples/net/wifi/boards/frdm_rw612.conf
rename to samples/net/wifi/shell/boards/frdm_rw612.conf
diff --git a/samples/net/wifi/boards/rd_rw612_bga.conf b/samples/net/wifi/shell/boards/rd_rw612_bga.conf
similarity index 100%
rename from samples/net/wifi/boards/rd_rw612_bga.conf
rename to samples/net/wifi/shell/boards/rd_rw612_bga.conf
diff --git a/samples/net/wifi/boards/reel_board.conf b/samples/net/wifi/shell/boards/reel_board.conf
similarity index 100%
rename from samples/net/wifi/boards/reel_board.conf
rename to samples/net/wifi/shell/boards/reel_board.conf
diff --git a/samples/net/wifi/boards/reel_board.overlay b/samples/net/wifi/shell/boards/reel_board.overlay
similarity index 100%
rename from samples/net/wifi/boards/reel_board.overlay
rename to samples/net/wifi/shell/boards/reel_board.overlay
diff --git a/samples/net/wifi/overlay-enterprise-variable-bufs.conf b/samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf
similarity index 100%
rename from samples/net/wifi/overlay-enterprise-variable-bufs.conf
rename to samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf
diff --git a/samples/net/wifi/overlay-enterprise.conf b/samples/net/wifi/shell/overlay-enterprise.conf
similarity index 100%
rename from samples/net/wifi/overlay-enterprise.conf
rename to samples/net/wifi/shell/overlay-enterprise.conf
diff --git a/samples/net/wifi/prj.conf b/samples/net/wifi/shell/prj.conf
similarity index 100%
rename from samples/net/wifi/prj.conf
rename to samples/net/wifi/shell/prj.conf
diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/shell/sample.yaml
similarity index 100%
rename from samples/net/wifi/sample.yaml
rename to samples/net/wifi/shell/sample.yaml
diff --git a/samples/net/wifi/socs/esp32_procpu.conf b/samples/net/wifi/shell/socs/esp32_procpu.conf
similarity index 100%
rename from samples/net/wifi/socs/esp32_procpu.conf
rename to samples/net/wifi/shell/socs/esp32_procpu.conf
diff --git a/samples/net/wifi/socs/esp32_procpu.overlay b/samples/net/wifi/shell/socs/esp32_procpu.overlay
similarity index 100%
rename from samples/net/wifi/socs/esp32_procpu.overlay
rename to samples/net/wifi/shell/socs/esp32_procpu.overlay
diff --git a/samples/net/wifi/socs/esp32c3.conf b/samples/net/wifi/shell/socs/esp32c3.conf
similarity index 100%
rename from samples/net/wifi/socs/esp32c3.conf
rename to samples/net/wifi/shell/socs/esp32c3.conf
diff --git a/samples/net/wifi/socs/esp32c3.overlay b/samples/net/wifi/shell/socs/esp32c3.overlay
similarity index 100%
rename from samples/net/wifi/socs/esp32c3.overlay
rename to samples/net/wifi/shell/socs/esp32c3.overlay
diff --git a/samples/net/wifi/socs/esp32s2.conf b/samples/net/wifi/shell/socs/esp32s2.conf
similarity index 100%
rename from samples/net/wifi/socs/esp32s2.conf
rename to samples/net/wifi/shell/socs/esp32s2.conf
diff --git a/samples/net/wifi/socs/esp32s2.overlay b/samples/net/wifi/shell/socs/esp32s2.overlay
similarity index 100%
rename from samples/net/wifi/socs/esp32s2.overlay
rename to samples/net/wifi/shell/socs/esp32s2.overlay
diff --git a/samples/net/wifi/socs/esp32s3_procpu.conf b/samples/net/wifi/shell/socs/esp32s3_procpu.conf
similarity index 100%
rename from samples/net/wifi/socs/esp32s3_procpu.conf
rename to samples/net/wifi/shell/socs/esp32s3_procpu.conf
diff --git a/samples/net/wifi/socs/esp32s3_procpu.overlay b/samples/net/wifi/shell/socs/esp32s3_procpu.overlay
similarity index 100%
rename from samples/net/wifi/socs/esp32s3_procpu.overlay
rename to samples/net/wifi/shell/socs/esp32s3_procpu.overlay
diff --git a/samples/net/wifi/src/wifi_test.c b/samples/net/wifi/shell/src/wifi_test.c
similarity index 100%
rename from samples/net/wifi/src/wifi_test.c
rename to samples/net/wifi/shell/src/wifi_test.c