diff --git a/examples/riot/blinky/Makefile b/examples/riot/blinky/Makefile
new file mode 100755
index 00000000..dd7cdb5b
--- /dev/null
+++ b/examples/riot/blinky/Makefile
@@ -0,0 +1,15 @@
+# name of your application
+APPLICATION = lf-test
+
+# If no BOARD is found in the environment, use this default:
+BOARD ?= native
+
+# Comment this out to disable code in RIOT that does safety checking
+# which is not needed in a production environment but helps in the
+# development process:
+DEVELHELP ?= 1
+
+# Change this to 0 show compiler invocation lines by default:
+QUIET ?= 1
+
+include $(CURDIR)/../../../make/riot/riot.mk
diff --git a/examples/riot/src/blinky/main.c b/examples/riot/blinky/main.c
similarity index 100%
rename from examples/riot/src/blinky/main.c
rename to examples/riot/blinky/main.c
diff --git a/examples/riot/external_modules/nanopb/Makefile b/examples/riot/external_modules/nanopb/Makefile
deleted file mode 100755
index 452de1a9..00000000
--- a/examples/riot/external_modules/nanopb/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(RIOTBASE)/Makefile.base
-
-all:
-	$(QQ)"$(MAKE)" -C ../../../../external/nanopb -f $(CURDIR)/nanopb.mk
diff --git a/examples/riot/external_modules/proto/Makefile b/examples/riot/external_modules/proto/Makefile
deleted file mode 100755
index 7244e2f4..00000000
--- a/examples/riot/external_modules/proto/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(RIOTBASE)/Makefile.base
-
-all:
-	$(QQ)"$(MAKE)" -C ../../../../external/proto -f $(CURDIR)/proto.mk
diff --git a/examples/riot/external_modules/reactor-uc/Makefile b/examples/riot/external_modules/reactor-uc/Makefile
deleted file mode 100755
index 82135041..00000000
--- a/examples/riot/external_modules/reactor-uc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(RIOTBASE)/Makefile.base
-
-all:
-	$(QQ)"$(MAKE)" -C ../../../../src -f $(CURDIR)/reactor-uc.mk
diff --git a/examples/riot/src/blinky/Makefile b/examples/riot/testing_posix_tcp_ip_channel_client/Makefile
similarity index 100%
rename from examples/riot/src/blinky/Makefile
rename to examples/riot/testing_posix_tcp_ip_channel_client/Makefile
diff --git a/examples/riot/src/testing_posix_tcp_ip_channel_client/main.c b/examples/riot/testing_posix_tcp_ip_channel_client/main.c
similarity index 100%
rename from examples/riot/src/testing_posix_tcp_ip_channel_client/main.c
rename to examples/riot/testing_posix_tcp_ip_channel_client/main.c
diff --git a/examples/riot/src/testing_posix_tcp_ip_channel_client/Makefile b/examples/riot/testing_posix_tcp_ip_channel_server/Makefile
similarity index 100%
rename from examples/riot/src/testing_posix_tcp_ip_channel_client/Makefile
rename to examples/riot/testing_posix_tcp_ip_channel_server/Makefile
diff --git a/examples/riot/src/testing_posix_tcp_ip_channel_server/main.c b/examples/riot/testing_posix_tcp_ip_channel_server/main.c
similarity index 100%
rename from examples/riot/src/testing_posix_tcp_ip_channel_server/main.c
rename to examples/riot/testing_posix_tcp_ip_channel_server/main.c
diff --git a/examples/riot/src/testing_posix_tcp_ip_channel_server/Makefile b/examples/riot/testing_tcp_ip_channel_server_callback/Makefile
similarity index 100%
rename from examples/riot/src/testing_posix_tcp_ip_channel_server/Makefile
rename to examples/riot/testing_tcp_ip_channel_server_callback/Makefile
diff --git a/examples/riot/src/testing_tcp_ip_channel_server_callback/main.c b/examples/riot/testing_tcp_ip_channel_server_callback/main.c
similarity index 100%
rename from examples/riot/src/testing_tcp_ip_channel_server_callback/main.c
rename to examples/riot/testing_tcp_ip_channel_server_callback/main.c
diff --git a/make/riot/external_modules/nanopb/Makefile b/make/riot/external_modules/nanopb/Makefile
new file mode 100755
index 00000000..42a4ae04
--- /dev/null
+++ b/make/riot/external_modules/nanopb/Makefile
@@ -0,0 +1,6 @@
+include $(RIOTBASE)/Makefile.base
+
+SRC_DIR := $(realpath $(CURDIR)/../../../../external/nanopb)
+
+all:
+	$(QQ)"$(MAKE)" -C $(SRC_DIR) -f $(CURDIR)/nanopb.mk
diff --git a/examples/riot/external_modules/nanopb/Makefile.include b/make/riot/external_modules/nanopb/Makefile.include
similarity index 100%
rename from examples/riot/external_modules/nanopb/Makefile.include
rename to make/riot/external_modules/nanopb/Makefile.include
diff --git a/examples/riot/external_modules/nanopb/nanopb.mk b/make/riot/external_modules/nanopb/nanopb.mk
similarity index 100%
rename from examples/riot/external_modules/nanopb/nanopb.mk
rename to make/riot/external_modules/nanopb/nanopb.mk
diff --git a/make/riot/external_modules/proto/Makefile b/make/riot/external_modules/proto/Makefile
new file mode 100755
index 00000000..180bd658
--- /dev/null
+++ b/make/riot/external_modules/proto/Makefile
@@ -0,0 +1,6 @@
+include $(RIOTBASE)/Makefile.base
+
+SRC_DIR := $(realpath $(CURDIR)/../../../../external/proto)
+
+all:
+	$(QQ)"$(MAKE)" -C $(SRC_DIR) -f $(CURDIR)/proto.mk
diff --git a/examples/riot/external_modules/proto/Makefile.include b/make/riot/external_modules/proto/Makefile.include
similarity index 100%
rename from examples/riot/external_modules/proto/Makefile.include
rename to make/riot/external_modules/proto/Makefile.include
diff --git a/examples/riot/external_modules/proto/proto.mk b/make/riot/external_modules/proto/proto.mk
similarity index 100%
rename from examples/riot/external_modules/proto/proto.mk
rename to make/riot/external_modules/proto/proto.mk
diff --git a/make/riot/external_modules/reactor-uc/Makefile b/make/riot/external_modules/reactor-uc/Makefile
new file mode 100755
index 00000000..70ce4c24
--- /dev/null
+++ b/make/riot/external_modules/reactor-uc/Makefile
@@ -0,0 +1,6 @@
+include $(RIOTBASE)/Makefile.base
+
+SRC_DIR := $(realpath $(CURDIR)/../../../../src)
+
+all:
+	$(QQ)"$(MAKE)" -C $(SRC_DIR) -f $(CURDIR)/reactor-uc.mk
diff --git a/examples/riot/external_modules/reactor-uc/Makefile.dep b/make/riot/external_modules/reactor-uc/Makefile.dep
similarity index 100%
rename from examples/riot/external_modules/reactor-uc/Makefile.dep
rename to make/riot/external_modules/reactor-uc/Makefile.dep
diff --git a/examples/riot/external_modules/reactor-uc/Makefile.include b/make/riot/external_modules/reactor-uc/Makefile.include
similarity index 100%
rename from examples/riot/external_modules/reactor-uc/Makefile.include
rename to make/riot/external_modules/reactor-uc/Makefile.include
diff --git a/examples/riot/external_modules/reactor-uc/reactor-uc.mk b/make/riot/external_modules/reactor-uc/reactor-uc.mk
similarity index 100%
rename from examples/riot/external_modules/reactor-uc/reactor-uc.mk
rename to make/riot/external_modules/reactor-uc/reactor-uc.mk
diff --git a/examples/riot/src/testing_tcp_ip_channel_server_callback/Makefile b/make/riot/riot.mk
old mode 100755
new mode 100644
similarity index 63%
rename from examples/riot/src/testing_tcp_ip_channel_server_callback/Makefile
rename to make/riot/riot.mk
index d32fc405..fc037129
--- a/examples/riot/src/testing_tcp_ip_channel_server_callback/Makefile
+++ b/make/riot/riot.mk
@@ -1,11 +1,7 @@
-# name of your application
-APPLICATION = lf-test
-
-# If no BOARD is found in the environment, use this default:
-BOARD ?= native
+RIOT_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # This has to be the absolute path to the RIOT base directory:
-RIOTBASE ?= $(CURDIR)/../../../../../RIOT
+RIOTBASE ?= $(RIOT_MK_DIR)/../../../RIOT
 
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
@@ -19,7 +15,7 @@ QUIET ?= 1
 FEATURES_OPTIONAL += periph_timer
 
 # External modules
-EXTERNAL_MODULE_DIRS += ../../external_modules
+EXTERNAL_MODULE_DIRS += $(RIOT_MK_DIR)/external_modules
 USEMODULE += reactor-uc
 
-include $(RIOTBASE)/Makefile.include
+include $(RIOTBASE)/Makefile.include
\ No newline at end of file
diff --git a/src/network_bundles.c b/src/network_bundles.c
deleted file mode 100644
index e69de29b..00000000