diff --git a/sys/Makefile b/sys/Makefile
index f9f80dd5aaa1561911ec8d8760a9888f537ec8d5..a915cbd600f3879a678bebe2877d4836003e9e66 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -68,7 +68,7 @@ ifneq (,$(findstring sixlowpan,$(USEMODULE)))
     DIRS += net/sixlowpan
 endif
 ifneq (,$(findstring rpl,$(USEMODULE)))
-    DIRS += net/rpl
+    DIRS += net/routing/rpl
 endif
 ifneq (,$(findstring ieee802154,$(USEMODULE)))
     DIRS += net/ieee802154
diff --git a/sys/net/rpl/Makefile b/sys/net/routing/rpl/Makefile
similarity index 100%
rename from sys/net/rpl/Makefile
rename to sys/net/routing/rpl/Makefile
diff --git a/sys/net/rpl/etx_beaconing.c b/sys/net/routing/rpl/etx_beaconing.c
similarity index 100%
rename from sys/net/rpl/etx_beaconing.c
rename to sys/net/routing/rpl/etx_beaconing.c
diff --git a/sys/net/rpl/etx_beaconing.h b/sys/net/routing/rpl/etx_beaconing.h
similarity index 100%
rename from sys/net/rpl/etx_beaconing.h
rename to sys/net/routing/rpl/etx_beaconing.h
diff --git a/sys/net/rpl/of0.c b/sys/net/routing/rpl/of0.c
similarity index 100%
rename from sys/net/rpl/of0.c
rename to sys/net/routing/rpl/of0.c
diff --git a/sys/net/rpl/of0.h b/sys/net/routing/rpl/of0.h
similarity index 100%
rename from sys/net/rpl/of0.h
rename to sys/net/routing/rpl/of0.h
diff --git a/sys/net/rpl/of_mrhof.c b/sys/net/routing/rpl/of_mrhof.c
similarity index 100%
rename from sys/net/rpl/of_mrhof.c
rename to sys/net/routing/rpl/of_mrhof.c
diff --git a/sys/net/rpl/of_mrhof.h b/sys/net/routing/rpl/of_mrhof.h
similarity index 100%
rename from sys/net/rpl/of_mrhof.h
rename to sys/net/routing/rpl/of_mrhof.h
diff --git a/sys/net/rpl/rpl.c b/sys/net/routing/rpl/rpl.c
similarity index 100%
rename from sys/net/rpl/rpl.c
rename to sys/net/routing/rpl/rpl.c
diff --git a/sys/net/rpl/rpl.h b/sys/net/routing/rpl/rpl.h
similarity index 100%
rename from sys/net/rpl/rpl.h
rename to sys/net/routing/rpl/rpl.h
diff --git a/sys/net/rpl/rpl_dodag.c b/sys/net/routing/rpl/rpl_dodag.c
similarity index 100%
rename from sys/net/rpl/rpl_dodag.c
rename to sys/net/routing/rpl/rpl_dodag.c
diff --git a/sys/net/rpl/rpl_dodag.h b/sys/net/routing/rpl/rpl_dodag.h
similarity index 100%
rename from sys/net/rpl/rpl_dodag.h
rename to sys/net/routing/rpl/rpl_dodag.h
diff --git a/sys/net/rpl/rpl_structs.h b/sys/net/routing/rpl/rpl_structs.h
similarity index 100%
rename from sys/net/rpl/rpl_structs.h
rename to sys/net/routing/rpl/rpl_structs.h
diff --git a/sys/net/rpl/trickle.c b/sys/net/routing/rpl/trickle.c
similarity index 100%
rename from sys/net/rpl/trickle.c
rename to sys/net/routing/rpl/trickle.c
diff --git a/sys/net/rpl/trickle.h b/sys/net/routing/rpl/trickle.h
similarity index 100%
rename from sys/net/rpl/trickle.h
rename to sys/net/routing/rpl/trickle.h