diff --git a/examples/ipv6-hooks/Makefile b/examples/libs/ipv6-hooks/Makefile
similarity index 84%
rename from examples/ipv6-hooks/Makefile
rename to examples/libs/ipv6-hooks/Makefile
index be8cc953e..63085face 100644
--- a/examples/ipv6-hooks/Makefile
+++ b/examples/libs/ipv6-hooks/Makefile
@@ -1,5 +1,5 @@
 CONTIKI_PROJECT = ipv6-hooks
 all: $(CONTIKI_PROJECT)
 
-CONTIKI=../..
+CONTIKI=../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/ipv6-hooks/README.md b/examples/libs/ipv6-hooks/README.md
similarity index 100%
rename from examples/ipv6-hooks/README.md
rename to examples/libs/ipv6-hooks/README.md
diff --git a/examples/ipv6-hooks/ipv6-hooks.c b/examples/libs/ipv6-hooks/ipv6-hooks.c
similarity index 100%
rename from examples/ipv6-hooks/ipv6-hooks.c
rename to examples/libs/ipv6-hooks/ipv6-hooks.c
diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile
index cb20757c7..76722e7f2 100644
--- a/tests/01-compile-base/Makefile
+++ b/tests/01-compile-base/Makefile
@@ -20,7 +20,7 @@ rpl-udp/sky \
 rpl-border-router/native \
 rpl-border-router/sky \
 slip-radio/sky \
-ipv6-hooks/sky \
+libs/ipv6-hooks/sky \
 nullnet/native \
 
 TOOLS=
diff --git a/tests/03-compile-arm-ports-02/Makefile b/tests/03-compile-arm-ports-02/Makefile
index 18b052f14..8cc99d914 100644
--- a/tests/03-compile-arm-ports-02/Makefile
+++ b/tests/03-compile-arm-ports-02/Makefile
@@ -59,7 +59,7 @@ rpl-udp/openmote-cc2538 \
 dev/gpio-hal/openmote-cc2538 \
 dev/leds/openmote-cc2538 \
 rpl-border-router/openmote-cc2538 \
-ipv6-hooks/openmote-cc2538 \
+libs/ipv6-hooks/openmote-cc2538 \
 
 TOOLS=