diff --git a/samples/advanced.rst b/samples/advanced.rst
deleted file mode 100644
index bd20d811ffd..00000000000
--- a/samples/advanced.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _advanced-samples:
-
-Advanced Samples
-#################
-
-The following is a list of advanced applications and samples using multiple
-features of the Zephyr project. Some of the samples below target a specific
-platform and use cases and can only be used with the documented target platform.
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   environmental_sensing/*
diff --git a/samples/boards/arduino_101/arduino_101.rst b/samples/boards/arduino_101/arduino_101.rst
new file mode 100644
index 00000000000..b56d73b3a2f
--- /dev/null
+++ b/samples/boards/arduino_101/arduino_101.rst
@@ -0,0 +1,10 @@
+.. _arduino101-samples:
+
+Arduino 101 Samples
+#####################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/environmental_sensing/Makefile b/samples/boards/arduino_101/environmental_sensing/Makefile
similarity index 100%
rename from samples/environmental_sensing/Makefile
rename to samples/boards/arduino_101/environmental_sensing/Makefile
diff --git a/samples/environmental_sensing/README.rst b/samples/boards/arduino_101/environmental_sensing/README.rst
similarity index 100%
rename from samples/environmental_sensing/README.rst
rename to samples/boards/arduino_101/environmental_sensing/README.rst
diff --git a/samples/environmental_sensing/ap/Makefile b/samples/boards/arduino_101/environmental_sensing/ap/Makefile
similarity index 100%
rename from samples/environmental_sensing/ap/Makefile
rename to samples/boards/arduino_101/environmental_sensing/ap/Makefile
diff --git a/samples/environmental_sensing/ap/prj.conf b/samples/boards/arduino_101/environmental_sensing/ap/prj.conf
similarity index 100%
rename from samples/environmental_sensing/ap/prj.conf
rename to samples/boards/arduino_101/environmental_sensing/ap/prj.conf
diff --git a/samples/environmental_sensing/ap/src/Makefile b/samples/boards/arduino_101/environmental_sensing/ap/src/Makefile
similarity index 100%
rename from samples/environmental_sensing/ap/src/Makefile
rename to samples/boards/arduino_101/environmental_sensing/ap/src/Makefile
diff --git a/samples/environmental_sensing/ap/src/main.c b/samples/boards/arduino_101/environmental_sensing/ap/src/main.c
similarity index 100%
rename from samples/environmental_sensing/ap/src/main.c
rename to samples/boards/arduino_101/environmental_sensing/ap/src/main.c
diff --git a/samples/environmental_sensing/ap/testcase.ini b/samples/boards/arduino_101/environmental_sensing/ap/testcase.ini
similarity index 100%
rename from samples/environmental_sensing/ap/testcase.ini
rename to samples/boards/arduino_101/environmental_sensing/ap/testcase.ini
diff --git a/samples/environmental_sensing/figures/temp_sensing_4.png b/samples/boards/arduino_101/environmental_sensing/figures/temp_sensing_4.png
similarity index 100%
rename from samples/environmental_sensing/figures/temp_sensing_4.png
rename to samples/boards/arduino_101/environmental_sensing/figures/temp_sensing_4.png
diff --git a/samples/environmental_sensing/figures/temp_sensing_5.png b/samples/boards/arduino_101/environmental_sensing/figures/temp_sensing_5.png
similarity index 100%
rename from samples/environmental_sensing/figures/temp_sensing_5.png
rename to samples/boards/arduino_101/environmental_sensing/figures/temp_sensing_5.png
diff --git a/samples/environmental_sensing/figures/wiring.png b/samples/boards/arduino_101/environmental_sensing/figures/wiring.png
similarity index 100%
rename from samples/environmental_sensing/figures/wiring.png
rename to samples/boards/arduino_101/environmental_sensing/figures/wiring.png
diff --git a/samples/environmental_sensing/sensor/Makefile b/samples/boards/arduino_101/environmental_sensing/sensor/Makefile
similarity index 100%
rename from samples/environmental_sensing/sensor/Makefile
rename to samples/boards/arduino_101/environmental_sensing/sensor/Makefile
diff --git a/samples/environmental_sensing/sensor/prj.conf b/samples/boards/arduino_101/environmental_sensing/sensor/prj.conf
similarity index 100%
rename from samples/environmental_sensing/sensor/prj.conf
rename to samples/boards/arduino_101/environmental_sensing/sensor/prj.conf
diff --git a/samples/environmental_sensing/sensor/src/Makefile b/samples/boards/arduino_101/environmental_sensing/sensor/src/Makefile
similarity index 100%
rename from samples/environmental_sensing/sensor/src/Makefile
rename to samples/boards/arduino_101/environmental_sensing/sensor/src/Makefile
diff --git a/samples/environmental_sensing/sensor/src/main.c b/samples/boards/arduino_101/environmental_sensing/sensor/src/main.c
similarity index 100%
rename from samples/environmental_sensing/sensor/src/main.c
rename to samples/boards/arduino_101/environmental_sensing/sensor/src/main.c
diff --git a/samples/environmental_sensing/sensor/testcase.ini b/samples/boards/arduino_101/environmental_sensing/sensor/testcase.ini
similarity index 100%
rename from samples/environmental_sensing/sensor/testcase.ini
rename to samples/boards/arduino_101/environmental_sensing/sensor/testcase.ini
diff --git a/samples/samples.rst b/samples/samples.rst
index 73e57783c1e..ad5bfdf7adf 100644
--- a/samples/samples.rst
+++ b/samples/samples.rst
@@ -17,7 +17,6 @@ Samples and Demos
    bluetooth/bluetooth.rst
    sensor/*
    grove/*
-   advanced
    power/power.rst
    boards/*