diff --git a/samples/power/power_mgr/Makefile b/samples/boards/quark_se_c1000/power_mgr/Makefile
similarity index 100%
rename from samples/power/power_mgr/Makefile
rename to samples/boards/quark_se_c1000/power_mgr/Makefile
diff --git a/samples/power/power_mgr/README.rst b/samples/boards/quark_se_c1000/power_mgr/README.rst
similarity index 100%
rename from samples/power/power_mgr/README.rst
rename to samples/boards/quark_se_c1000/power_mgr/README.rst
diff --git a/samples/power/power_mgr/prj.conf b/samples/boards/quark_se_c1000/power_mgr/prj.conf
similarity index 100%
rename from samples/power/power_mgr/prj.conf
rename to samples/boards/quark_se_c1000/power_mgr/prj.conf
diff --git a/samples/power/power_mgr/prj_tickless.conf b/samples/boards/quark_se_c1000/power_mgr/prj_tickless.conf
similarity index 100%
rename from samples/power/power_mgr/prj_tickless.conf
rename to samples/boards/quark_se_c1000/power_mgr/prj_tickless.conf
diff --git a/samples/power/power_mgr/src/Makefile b/samples/boards/quark_se_c1000/power_mgr/src/Makefile
similarity index 100%
rename from samples/power/power_mgr/src/Makefile
rename to samples/boards/quark_se_c1000/power_mgr/src/Makefile
diff --git a/samples/power/power_mgr/src/main.c b/samples/boards/quark_se_c1000/power_mgr/src/main.c
similarity index 100%
rename from samples/power/power_mgr/src/main.c
rename to samples/boards/quark_se_c1000/power_mgr/src/main.c
diff --git a/samples/power/power_mgr/testcase.ini b/samples/boards/quark_se_c1000/power_mgr/testcase.ini
similarity index 100%
rename from samples/power/power_mgr/testcase.ini
rename to samples/boards/quark_se_c1000/power_mgr/testcase.ini
diff --git a/samples/boards/quark_se_c1000/quark_se_c1000_devboard.rst b/samples/boards/quark_se_c1000/quark_se_c1000_devboard.rst
new file mode 100644
index 00000000000..cf07eb51984
--- /dev/null
+++ b/samples/boards/quark_se_c1000/quark_se_c1000_devboard.rst
@@ -0,0 +1,10 @@
+.. _quark_se_c1000_devboard1-samples:
+
+Quark SE C1000 Devboard Samples
+###############################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/power/power.rst b/samples/power/power.rst
deleted file mode 100644
index 2c9983cbad9..00000000000
--- a/samples/power/power.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. _power-management-samples:
-
-Power Management Samples
-########################
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   power_mgr/*
diff --git a/samples/samples.rst b/samples/samples.rst
index ad5bfdf7adf..e62e2267975 100644
--- a/samples/samples.rst
+++ b/samples/samples.rst
@@ -17,7 +17,6 @@ Samples and Demos
    bluetooth/bluetooth.rst
    sensor/*
    grove/*
-   power/power.rst
    boards/*