diff --git a/samples/display/cfb/CMakeLists.txt b/samples/subsys/display/cfb/CMakeLists.txt
similarity index 100%
rename from samples/display/cfb/CMakeLists.txt
rename to samples/subsys/display/cfb/CMakeLists.txt
diff --git a/samples/display/cfb/README.rst b/samples/subsys/display/cfb/README.rst
similarity index 100%
rename from samples/display/cfb/README.rst
rename to samples/subsys/display/cfb/README.rst
diff --git a/samples/display/cfb/boards/native_posix.conf b/samples/subsys/display/cfb/boards/native_posix.conf
similarity index 100%
rename from samples/display/cfb/boards/native_posix.conf
rename to samples/subsys/display/cfb/boards/native_posix.conf
diff --git a/samples/display/cfb/boards/native_posix_64.conf b/samples/subsys/display/cfb/boards/native_posix_64.conf
similarity index 100%
rename from samples/display/cfb/boards/native_posix_64.conf
rename to samples/subsys/display/cfb/boards/native_posix_64.conf
diff --git a/samples/display/cfb/boards/reel_board.conf b/samples/subsys/display/cfb/boards/reel_board.conf
similarity index 100%
rename from samples/display/cfb/boards/reel_board.conf
rename to samples/subsys/display/cfb/boards/reel_board.conf
diff --git a/samples/display/cfb/boards/reel_board_v2.conf b/samples/subsys/display/cfb/boards/reel_board_v2.conf
similarity index 100%
rename from samples/display/cfb/boards/reel_board_v2.conf
rename to samples/subsys/display/cfb/boards/reel_board_v2.conf
diff --git a/samples/display/cfb/prj.conf b/samples/subsys/display/cfb/prj.conf
similarity index 100%
rename from samples/display/cfb/prj.conf
rename to samples/subsys/display/cfb/prj.conf
diff --git a/samples/display/cfb/sample.yaml b/samples/subsys/display/cfb/sample.yaml
similarity index 100%
rename from samples/display/cfb/sample.yaml
rename to samples/subsys/display/cfb/sample.yaml
diff --git a/samples/display/cfb/src/main.c b/samples/subsys/display/cfb/src/main.c
similarity index 100%
rename from samples/display/cfb/src/main.c
rename to samples/subsys/display/cfb/src/main.c
diff --git a/samples/display/cfb_custom_font/CMakeLists.txt b/samples/subsys/display/cfb_custom_font/CMakeLists.txt
similarity index 100%
rename from samples/display/cfb_custom_font/CMakeLists.txt
rename to samples/subsys/display/cfb_custom_font/CMakeLists.txt
diff --git a/samples/display/cfb_custom_font/README.rst b/samples/subsys/display/cfb_custom_font/README.rst
similarity index 100%
rename from samples/display/cfb_custom_font/README.rst
rename to samples/subsys/display/cfb_custom_font/README.rst
diff --git a/samples/display/cfb_custom_font/boards/reel_board.conf b/samples/subsys/display/cfb_custom_font/boards/reel_board.conf
similarity index 100%
rename from samples/display/cfb_custom_font/boards/reel_board.conf
rename to samples/subsys/display/cfb_custom_font/boards/reel_board.conf
diff --git a/samples/display/cfb_custom_font/fonts/dice.png b/samples/subsys/display/cfb_custom_font/fonts/dice.png
similarity index 100%
rename from samples/display/cfb_custom_font/fonts/dice.png
rename to samples/subsys/display/cfb_custom_font/fonts/dice.png
diff --git a/samples/display/cfb_custom_font/prj.conf b/samples/subsys/display/cfb_custom_font/prj.conf
similarity index 100%
rename from samples/display/cfb_custom_font/prj.conf
rename to samples/subsys/display/cfb_custom_font/prj.conf
diff --git a/samples/display/cfb_custom_font/sample.yaml b/samples/subsys/display/cfb_custom_font/sample.yaml
similarity index 100%
rename from samples/display/cfb_custom_font/sample.yaml
rename to samples/subsys/display/cfb_custom_font/sample.yaml
diff --git a/samples/display/cfb_custom_font/src/main.c b/samples/subsys/display/cfb_custom_font/src/main.c
similarity index 100%
rename from samples/display/cfb_custom_font/src/main.c
rename to samples/subsys/display/cfb_custom_font/src/main.c
diff --git a/samples/display/cfb_shell/CMakeLists.txt b/samples/subsys/display/cfb_shell/CMakeLists.txt
similarity index 100%
rename from samples/display/cfb_shell/CMakeLists.txt
rename to samples/subsys/display/cfb_shell/CMakeLists.txt
diff --git a/samples/display/cfb_shell/README.rst b/samples/subsys/display/cfb_shell/README.rst
similarity index 100%
rename from samples/display/cfb_shell/README.rst
rename to samples/subsys/display/cfb_shell/README.rst
diff --git a/samples/display/cfb_shell/boards/reel_board.conf b/samples/subsys/display/cfb_shell/boards/reel_board.conf
similarity index 100%
rename from samples/display/cfb_shell/boards/reel_board.conf
rename to samples/subsys/display/cfb_shell/boards/reel_board.conf
diff --git a/samples/display/cfb_shell/prj.conf b/samples/subsys/display/cfb_shell/prj.conf
similarity index 100%
rename from samples/display/cfb_shell/prj.conf
rename to samples/subsys/display/cfb_shell/prj.conf
diff --git a/samples/display/cfb_shell/sample.yaml b/samples/subsys/display/cfb_shell/sample.yaml
similarity index 100%
rename from samples/display/cfb_shell/sample.yaml
rename to samples/subsys/display/cfb_shell/sample.yaml
diff --git a/samples/display/cfb_shell/src/main.c b/samples/subsys/display/cfb_shell/src/main.c
similarity index 100%
rename from samples/display/cfb_shell/src/main.c
rename to samples/subsys/display/cfb_shell/src/main.c
diff --git a/samples/display/display.rst b/samples/subsys/display/display.rst
similarity index 100%
rename from samples/display/display.rst
rename to samples/subsys/display/display.rst
diff --git a/samples/display/grove_display/CMakeLists.txt b/samples/subsys/display/grove_display/CMakeLists.txt
similarity index 100%
rename from samples/display/grove_display/CMakeLists.txt
rename to samples/subsys/display/grove_display/CMakeLists.txt
diff --git a/samples/display/grove_display/README.rst b/samples/subsys/display/grove_display/README.rst
similarity index 100%
rename from samples/display/grove_display/README.rst
rename to samples/subsys/display/grove_display/README.rst
diff --git a/samples/display/grove_display/boards/serpente.overlay b/samples/subsys/display/grove_display/boards/serpente.overlay
similarity index 100%
rename from samples/display/grove_display/boards/serpente.overlay
rename to samples/subsys/display/grove_display/boards/serpente.overlay
diff --git a/samples/display/grove_display/prj.conf b/samples/subsys/display/grove_display/prj.conf
similarity index 100%
rename from samples/display/grove_display/prj.conf
rename to samples/subsys/display/grove_display/prj.conf
diff --git a/samples/display/grove_display/sample.yaml b/samples/subsys/display/grove_display/sample.yaml
similarity index 100%
rename from samples/display/grove_display/sample.yaml
rename to samples/subsys/display/grove_display/sample.yaml
diff --git a/samples/display/grove_display/src/main.c b/samples/subsys/display/grove_display/src/main.c
similarity index 100%
rename from samples/display/grove_display/src/main.c
rename to samples/subsys/display/grove_display/src/main.c
diff --git a/samples/display/lvgl/CMakeLists.txt b/samples/subsys/display/lvgl/CMakeLists.txt
similarity index 100%
rename from samples/display/lvgl/CMakeLists.txt
rename to samples/subsys/display/lvgl/CMakeLists.txt
diff --git a/samples/display/lvgl/README.rst b/samples/subsys/display/lvgl/README.rst
similarity index 100%
rename from samples/display/lvgl/README.rst
rename to samples/subsys/display/lvgl/README.rst
diff --git a/samples/display/lvgl/boards/hsdk.conf b/samples/subsys/display/lvgl/boards/hsdk.conf
similarity index 100%
rename from samples/display/lvgl/boards/hsdk.conf
rename to samples/subsys/display/lvgl/boards/hsdk.conf
diff --git a/samples/display/lvgl/boards/native_posix.conf b/samples/subsys/display/lvgl/boards/native_posix.conf
similarity index 100%
rename from samples/display/lvgl/boards/native_posix.conf
rename to samples/subsys/display/lvgl/boards/native_posix.conf
diff --git a/samples/display/lvgl/boards/native_posix_64.conf b/samples/subsys/display/lvgl/boards/native_posix_64.conf
similarity index 100%
rename from samples/display/lvgl/boards/native_posix_64.conf
rename to samples/subsys/display/lvgl/boards/native_posix_64.conf
diff --git a/samples/display/lvgl/prj.conf b/samples/subsys/display/lvgl/prj.conf
similarity index 100%
rename from samples/display/lvgl/prj.conf
rename to samples/subsys/display/lvgl/prj.conf
diff --git a/samples/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
similarity index 100%
rename from samples/display/lvgl/sample.yaml
rename to samples/subsys/display/lvgl/sample.yaml
diff --git a/samples/display/lvgl/src/main.c b/samples/subsys/display/lvgl/src/main.c
similarity index 100%
rename from samples/display/lvgl/src/main.c
rename to samples/subsys/display/lvgl/src/main.c