diff --git a/examples/logging/Makefile b/examples/libs/logging/Makefile
similarity index 82%
rename from examples/logging/Makefile
rename to examples/libs/logging/Makefile
index 6f8cecf83..d394c0bc4 100644
--- a/examples/logging/Makefile
+++ b/examples/libs/logging/Makefile
@@ -1,5 +1,5 @@
 CONTIKI_PROJECT = logging
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/logging/README.md b/examples/libs/logging/README.md
similarity index 100%
rename from examples/logging/README.md
rename to examples/libs/logging/README.md
diff --git a/examples/logging/logging.c b/examples/libs/logging/logging.c
similarity index 100%
rename from examples/logging/logging.c
rename to examples/libs/logging/logging.c
diff --git a/examples/logging/project-conf.h b/examples/libs/logging/project-conf.h
similarity index 100%
rename from examples/logging/project-conf.h
rename to examples/libs/logging/project-conf.h
diff --git a/examples/timers/Makefile b/examples/libs/timers/Makefile
similarity index 82%
rename from examples/timers/Makefile
rename to examples/libs/timers/Makefile
index d5b2a2846..60b9c2531 100644
--- a/examples/timers/Makefile
+++ b/examples/libs/timers/Makefile
@@ -1,5 +1,5 @@
 CONTIKI_PROJECT = all-timers
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/timers/all-timers.c b/examples/libs/timers/all-timers.c
similarity index 100%
rename from examples/timers/all-timers.c
rename to examples/libs/timers/all-timers.c
diff --git a/examples/trickle-library/Makefile b/examples/libs/trickle-library/Makefile
similarity index 83%
rename from examples/trickle-library/Makefile
rename to examples/libs/trickle-library/Makefile
index bf7303166..aa3b25f9a 100644
--- a/examples/trickle-library/Makefile
+++ b/examples/libs/trickle-library/Makefile
@@ -2,6 +2,6 @@ CONTIKI_PROJECT = trickle-library
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/trickle-library/trickle-library.c b/examples/libs/trickle-library/trickle-library.c
similarity index 100%
rename from examples/trickle-library/trickle-library.c
rename to examples/libs/trickle-library/trickle-library.c
diff --git a/examples/trickle-library/trickle-library.csc b/examples/libs/trickle-library/trickle-library.csc
similarity index 96%
rename from examples/trickle-library/trickle-library.csc
rename to examples/libs/trickle-library/trickle-library.csc
index 7a6d74ca2..bea3f6c3e 100644
--- a/examples/trickle-library/trickle-library.csc
+++ b/examples/libs/trickle-library/trickle-library.csc
@@ -25,9 +25,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>trickle-tester</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/trickle-library/trickle-library.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/libs/trickle-library/trickle-library.c</source>
       <commands EXPORT="discard">make trickle-library.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/trickle-library/trickle-library.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/libs/trickle-library/trickle-library.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile
index a8d04531e..46c56ceeb 100644
--- a/tests/01-compile-base/Makefile
+++ b/tests/01-compile-base/Makefile
@@ -6,7 +6,7 @@ hello-world/native \
 hello-world/sky \
 storage/eeprom-test/native \
 multicast/sky \
-logging/native \
+libs/logging/native \
 rpl-udp/sky \
 
 TOOLS=
diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile
index 460ced48f..49401ab6d 100644
--- a/tests/02-compile-arm-ports/Makefile
+++ b/tests/02-compile-arm-ports/Makefile
@@ -42,7 +42,7 @@ storage/cfs-coffee/zoul \
 rpl-tsch/zoul \
 rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \
 rpl-tsch/zoul:MAKE_WITH_SECURITY=1 \
-logging/zoul \
+libs/logging/zoul \
 6tisch/etsi-plugtest-2017/zoul:BOARD=remote \
 6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650
 
diff --git a/tests/03-compile-nxp-ports/Makefile b/tests/03-compile-nxp-ports/Makefile
index 87f7b0f1d..559717b4b 100644
--- a/tests/03-compile-nxp-ports/Makefile
+++ b/tests/03-compile-nxp-ports/Makefile
@@ -19,7 +19,7 @@ sensniff/jn516x \
 rpl-tsch/jn516x \
 rpl-tsch/jn516x:MAKE_WITH_ORCHESTRA=1 \
 rpl-tsch/jn516x:MAKE_WITH_SECURITY=1 \
-logging/jn516x \
+libs/logging/jn516x \
 6tisch/etsi-plugtest-2017/jn516x
 
 TOOLS=
diff --git a/tests/04-compile-nrf52-ports/Makefile b/tests/04-compile-nrf52-ports/Makefile
index f3448450c..7f4ad4f2d 100644
--- a/tests/04-compile-nrf52-ports/Makefile
+++ b/tests/04-compile-nrf52-ports/Makefile
@@ -13,7 +13,7 @@ platform-specific/nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
 platform-specific/nrf52dk/mqtt-demo/nrf52dk \
 platform-specific/nrf52dk/blink-hello/nrf52dk \
 platform-specific/nrf52dk/timer-test/nrf52dk \
-logging/nrf52dk
+libs/logging/nrf52dk
 
 TOOLS=