diff --git a/sys/Makefile b/sys/Makefile
index 216161d38299aa48a253f59dded73e64e8cf3f60..46861adaa6a6ab9f656fa6d98919056935fd768f 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -65,7 +65,7 @@ ifneq (,$(findstring protocol_multiplex,$(USEMODULE)))
     DIRS += net/link_layer/protocol-multiplex
 endif
 ifneq (,$(findstring sixlowpan,$(USEMODULE)))
-    DIRS += net/sixlowpan
+    DIRS += net/network_layer/sixlowpan
 endif
 ifneq (,$(findstring rpl,$(USEMODULE)))
     DIRS += net/routing/rpl
diff --git a/sys/net/include/ipv6.h b/sys/net/include/ipv6.h
index e17fc2d8f21266dd48296e87bf200088d34d2275..9d5eabd494c3083d6d9f0ab6f9c0e98404f4acf1 100644
--- a/sys/net/include/ipv6.h
+++ b/sys/net/include/ipv6.h
@@ -23,7 +23,7 @@
 #include "sixlowpan/icmp.h"
 #include "sixlowpan/ndp.h"
 
-#include "../sixlowpan/icmp.h"        /* TODO: remove if not needed anymore */
+#include "../network_layer/sixlowpan/icmp.h"        /* TODO: remove if not needed anymore */
 
 /**
  * @}
diff --git a/sys/net/sixlowpan/Makefile b/sys/net/network_layer/sixlowpan/Makefile
similarity index 100%
rename from sys/net/sixlowpan/Makefile
rename to sys/net/network_layer/sixlowpan/Makefile
diff --git a/sys/net/sixlowpan/border.c b/sys/net/network_layer/sixlowpan/border.c
similarity index 100%
rename from sys/net/sixlowpan/border.c
rename to sys/net/network_layer/sixlowpan/border.c
diff --git a/sys/net/sixlowpan/border.h b/sys/net/network_layer/sixlowpan/border.h
similarity index 100%
rename from sys/net/sixlowpan/border.h
rename to sys/net/network_layer/sixlowpan/border.h
diff --git a/sys/net/sixlowpan/bordermultiplex.c b/sys/net/network_layer/sixlowpan/bordermultiplex.c
similarity index 100%
rename from sys/net/sixlowpan/bordermultiplex.c
rename to sys/net/network_layer/sixlowpan/bordermultiplex.c
diff --git a/sys/net/sixlowpan/bordermultiplex.h b/sys/net/network_layer/sixlowpan/bordermultiplex.h
similarity index 100%
rename from sys/net/sixlowpan/bordermultiplex.h
rename to sys/net/network_layer/sixlowpan/bordermultiplex.h
diff --git a/sys/net/sixlowpan/flowcontrol.c b/sys/net/network_layer/sixlowpan/flowcontrol.c
similarity index 100%
rename from sys/net/sixlowpan/flowcontrol.c
rename to sys/net/network_layer/sixlowpan/flowcontrol.c
diff --git a/sys/net/sixlowpan/flowcontrol.h b/sys/net/network_layer/sixlowpan/flowcontrol.h
similarity index 100%
rename from sys/net/sixlowpan/flowcontrol.h
rename to sys/net/network_layer/sixlowpan/flowcontrol.h
diff --git a/sys/net/sixlowpan/icmp.c b/sys/net/network_layer/sixlowpan/icmp.c
similarity index 100%
rename from sys/net/sixlowpan/icmp.c
rename to sys/net/network_layer/sixlowpan/icmp.c
diff --git a/sys/net/sixlowpan/icmp.h b/sys/net/network_layer/sixlowpan/icmp.h
similarity index 100%
rename from sys/net/sixlowpan/icmp.h
rename to sys/net/network_layer/sixlowpan/icmp.h
diff --git a/sys/net/sixlowpan/ip.c b/sys/net/network_layer/sixlowpan/ip.c
similarity index 100%
rename from sys/net/sixlowpan/ip.c
rename to sys/net/network_layer/sixlowpan/ip.c
diff --git a/sys/net/sixlowpan/ip.h b/sys/net/network_layer/sixlowpan/ip.h
similarity index 100%
rename from sys/net/sixlowpan/ip.h
rename to sys/net/network_layer/sixlowpan/ip.h
diff --git a/sys/net/sixlowpan/lowpan.c b/sys/net/network_layer/sixlowpan/lowpan.c
similarity index 100%
rename from sys/net/sixlowpan/lowpan.c
rename to sys/net/network_layer/sixlowpan/lowpan.c
diff --git a/sys/net/sixlowpan/lowpan.h b/sys/net/network_layer/sixlowpan/lowpan.h
similarity index 100%
rename from sys/net/sixlowpan/lowpan.h
rename to sys/net/network_layer/sixlowpan/lowpan.h
diff --git a/sys/net/sixlowpan/mac.c b/sys/net/network_layer/sixlowpan/mac.c
similarity index 100%
rename from sys/net/sixlowpan/mac.c
rename to sys/net/network_layer/sixlowpan/mac.c
diff --git a/sys/net/sixlowpan/serialnumber.c b/sys/net/network_layer/sixlowpan/serialnumber.c
similarity index 100%
rename from sys/net/sixlowpan/serialnumber.c
rename to sys/net/network_layer/sixlowpan/serialnumber.c
diff --git a/sys/net/sixlowpan/serialnumber.h b/sys/net/network_layer/sixlowpan/serialnumber.h
similarity index 100%
rename from sys/net/sixlowpan/serialnumber.h
rename to sys/net/network_layer/sixlowpan/serialnumber.h