diff --git a/samples/subsys/cpp/cpp.rst b/samples/subsys/cpp/cpp.rst
new file mode 100644
index 0000000000..aeecebadcc
--- /dev/null
+++ b/samples/subsys/cpp/cpp.rst
@@ -0,0 +1,10 @@
+.. _cpp-samples:
+
+C++ Samples
+###########
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/cpp_synchronization/CMakeLists.txt b/samples/subsys/cpp/cpp_synchronization/CMakeLists.txt
similarity index 100%
rename from samples/cpp_synchronization/CMakeLists.txt
rename to samples/subsys/cpp/cpp_synchronization/CMakeLists.txt
diff --git a/samples/cpp_synchronization/README.rst b/samples/subsys/cpp/cpp_synchronization/README.rst
similarity index 100%
rename from samples/cpp_synchronization/README.rst
rename to samples/subsys/cpp/cpp_synchronization/README.rst
diff --git a/samples/cpp_synchronization/prj.conf b/samples/subsys/cpp/cpp_synchronization/prj.conf
similarity index 100%
rename from samples/cpp_synchronization/prj.conf
rename to samples/subsys/cpp/cpp_synchronization/prj.conf
diff --git a/samples/cpp_synchronization/sample.yaml b/samples/subsys/cpp/cpp_synchronization/sample.yaml
similarity index 100%
rename from samples/cpp_synchronization/sample.yaml
rename to samples/subsys/cpp/cpp_synchronization/sample.yaml
diff --git a/samples/cpp_synchronization/src/main.cpp b/samples/subsys/cpp/cpp_synchronization/src/main.cpp
similarity index 100%
rename from samples/cpp_synchronization/src/main.cpp
rename to samples/subsys/cpp/cpp_synchronization/src/main.cpp