diff --git a/examples/ipso-objects/Makefile b/examples/ipso-objects/Makefile
index 673b57aef..d4a1ef503 100644
--- a/examples/ipso-objects/Makefile
+++ b/examples/ipso-objects/Makefile
@@ -21,5 +21,5 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 -p 60001 aaaa::1/64
 
-connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-router.native
-	sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 aaaa::1/64
+connect-router-native:	$(CONTIKI)/examples/native-border-router/border-router.native
+	sudo $(CONTIKI)/examples/native-border-router/border-router.native -a 127.0.0.1 -p 60001 aaaa::1/64
diff --git a/examples/ipv6/coap-example/Makefile b/examples/ipv6/coap-example/Makefile
index 367ae2689..1e5373698 100644
--- a/examples/ipv6/coap-example/Makefile
+++ b/examples/ipv6/coap-example/Makefile
@@ -45,8 +45,8 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 -p 60001 fd00::1/64
 
-connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-router.native
-	sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 fd00::1/64
+connect-router-native:	$(CONTIKI)/examples/native-border-router/border-router.native
+	sudo $(CONTIKI)/examples/native-border-router/border-router.native -a 127.0.0.1 -p 60001 fd00::1/64
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
diff --git a/examples/ipv6/native-border-router/Makefile b/examples/native-border-router/Makefile
similarity index 97%
rename from examples/ipv6/native-border-router/Makefile
rename to examples/native-border-router/Makefile
index 96a358165..01345f92f 100644
--- a/examples/ipv6/native-border-router/Makefile
+++ b/examples/native-border-router/Makefile
@@ -2,7 +2,7 @@ CONTIKI_PROJECT=border-router
 all: $(CONTIKI_PROJECT)
 MODULES += os/services/slip-cmd
 
-CONTIKI=../../..
+CONTIKI=../..
 
 PROJECT_SOURCEFILES += border-router-cmds.c tun-bridge.c border-router-mac.c \
 slip-config.c slip-dev.c
diff --git a/examples/ipv6/native-border-router/Makefile.target b/examples/native-border-router/Makefile.target
similarity index 100%
rename from examples/ipv6/native-border-router/Makefile.target
rename to examples/native-border-router/Makefile.target
diff --git a/examples/ipv6/native-border-router/README.md b/examples/native-border-router/README.md
similarity index 100%
rename from examples/ipv6/native-border-router/README.md
rename to examples/native-border-router/README.md
diff --git a/examples/ipv6/native-border-router/border-router-cmds.c b/examples/native-border-router/border-router-cmds.c
similarity index 100%
rename from examples/ipv6/native-border-router/border-router-cmds.c
rename to examples/native-border-router/border-router-cmds.c
diff --git a/examples/ipv6/native-border-router/border-router-cmds.h b/examples/native-border-router/border-router-cmds.h
similarity index 100%
rename from examples/ipv6/native-border-router/border-router-cmds.h
rename to examples/native-border-router/border-router-cmds.h
diff --git a/examples/ipv6/native-border-router/border-router-mac.c b/examples/native-border-router/border-router-mac.c
similarity index 100%
rename from examples/ipv6/native-border-router/border-router-mac.c
rename to examples/native-border-router/border-router-mac.c
diff --git a/examples/ipv6/native-border-router/border-router.c b/examples/native-border-router/border-router.c
similarity index 100%
rename from examples/ipv6/native-border-router/border-router.c
rename to examples/native-border-router/border-router.c
diff --git a/examples/ipv6/native-border-router/border-router.h b/examples/native-border-router/border-router.h
similarity index 100%
rename from examples/ipv6/native-border-router/border-router.h
rename to examples/native-border-router/border-router.h
diff --git a/examples/ipv6/native-border-router/httpd-simple.c b/examples/native-border-router/httpd-simple.c
similarity index 100%
rename from examples/ipv6/native-border-router/httpd-simple.c
rename to examples/native-border-router/httpd-simple.c
diff --git a/examples/ipv6/native-border-router/httpd-simple.h b/examples/native-border-router/httpd-simple.h
similarity index 100%
rename from examples/ipv6/native-border-router/httpd-simple.h
rename to examples/native-border-router/httpd-simple.h
diff --git a/examples/ipv6/native-border-router/project-conf.h b/examples/native-border-router/project-conf.h
similarity index 100%
rename from examples/ipv6/native-border-router/project-conf.h
rename to examples/native-border-router/project-conf.h
diff --git a/examples/ipv6/native-border-router/slip-config.c b/examples/native-border-router/slip-config.c
similarity index 100%
rename from examples/ipv6/native-border-router/slip-config.c
rename to examples/native-border-router/slip-config.c
diff --git a/examples/ipv6/native-border-router/slip-dev.c b/examples/native-border-router/slip-dev.c
similarity index 100%
rename from examples/ipv6/native-border-router/slip-dev.c
rename to examples/native-border-router/slip-dev.c
diff --git a/examples/ipv6/native-border-router/tun-bridge.c b/examples/native-border-router/tun-bridge.c
similarity index 100%
rename from examples/ipv6/native-border-router/tun-bridge.c
rename to examples/native-border-router/tun-bridge.c