diff --git a/Makefile.dep b/Makefile.dep
index 107e3abaa9ae556f6dbcf6b3365d4d20234861e6..340278cc701d077c975d869772ad34b6ee0d91ce 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -76,3 +76,7 @@ endif
 ifneq (,$(filter shell_commands,$(USEMODULE)))
 	USEMODULE += net_help
 endif
+
+ifneq (,$(filter ccn_lite,$(USEMODULE)))
+	USEMODULE += crypto
+endif
diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile
index dffa1ea94f5fd075f4c2423e60c514c1397567c0..fc4384a9083e4e84266ad660af9f93bf0bc1ffe0 100644
--- a/examples/ccn-lite-client/Makefile
+++ b/examples/ccn-lite-client/Makefile
@@ -48,7 +48,6 @@ USEMODULE += ps
 USEMODULE += random
 USEMODULE += defaulttransceiver
 USEMODULE += rtc
-USEMODULE += crypto_sha256
 USEMODULE += ccn_lite
 USEMODULE += ccn_lite_client
 
diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile
index b3d1f8c7491254577ef72af092cdc2bf172c999e..967fff191561218b0d82987a6ad31d926a4472d0 100644
--- a/examples/ccn-lite-relay/Makefile
+++ b/examples/ccn-lite-relay/Makefile
@@ -45,7 +45,6 @@ USEMODULE += posix
 
 USEMODULE += defaulttransceiver
 USEMODULE += rtc
-USEMODULE += crypto_sha256
 USEMODULE += ccn_lite
 
 include $(RIOTBASE)/Makefile.include
diff --git a/sys/Makefile b/sys/Makefile
index 8729f6ddcd3e9346b2dd8b479297c81bd3026734..e9e61c1ccfb7075f674d2efe591ce7490c7f143f 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -71,23 +71,8 @@ endif
 ifneq (,$(filter bloom,$(USEMODULE)))
     DIRS += bloom
 endif
-ifneq (,$(filter crypto_3des,$(USEMODULE)))
-    DIRS += crypto/3des
-endif
-ifneq (,$(filter crypto_aes,$(USEMODULE)))
-    DIRS += crypto/aes
-endif
-ifneq (,$(filter crypto_rc5,$(USEMODULE)))
-    DIRS += crypto/rc5
-endif
-ifneq (,$(filter crypto_sha256,$(USEMODULE)))
-    DIRS += crypto/sha256
-endif
-ifneq (,$(filter crypto_skipjack,$(USEMODULE)))
-    DIRS += crypto/skipjack
-endif
-ifneq (,$(filter crypto_twofish,$(USEMODULE)))
-    DIRS += crypto/twofish
+ifneq (,$(filter crypto,$(USEMODULE)))
+    DIRS += crypto
 endif
 ifneq (,$(filter random,$(USEMODULE)))
     DIRS += random
diff --git a/sys/Makefile.include b/sys/Makefile.include
index 4a35e9508ce7873a3fd7cf97ba6263cc6a11580c..ddf496ce1bd95bf66068da008d72b0b737dc4865 100644
--- a/sys/Makefile.include
+++ b/sys/Makefile.include
@@ -30,24 +30,9 @@ ifneq (,$(filter ccn_lite_client,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
 endif
 
-ifneq (,$(filter crypto_3des,$(USEMODULE)))
+ifneq (,$(filter crypto,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/include/crypto
 endif
-ifneq (,$(filter crypto_aes,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_rc5,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_sha256,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_skipjack,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_twofish,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
 
 ifneq (,$(filter posix,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
diff --git a/sys/crypto/3des/3des.c b/sys/crypto/3des.c
similarity index 100%
rename from sys/crypto/3des/3des.c
rename to sys/crypto/3des.c
diff --git a/sys/crypto/3des/Makefile b/sys/crypto/3des/Makefile
deleted file mode 100644
index 1f5e5d84efdcc58c580db1c3bdc8fe0a71a98935..0000000000000000000000000000000000000000
--- a/sys/crypto/3des/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_3des
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/aes/Makefile b/sys/crypto/Makefile
similarity index 63%
rename from sys/crypto/aes/Makefile
rename to sys/crypto/Makefile
index f00a84dbc6e9d92a48d39532e174b5679fe5eea2..de999331f7205f7153da802e19b47556c55d3d06 100644
--- a/sys/crypto/aes/Makefile
+++ b/sys/crypto/Makefile
@@ -1,3 +1,3 @@
-MODULE = crypto_aes
+MODULE = crypto
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/aes/aes.c b/sys/crypto/aes.c
similarity index 100%
rename from sys/crypto/aes/aes.c
rename to sys/crypto/aes.c
diff --git a/sys/crypto/rc5/rc5.c b/sys/crypto/rc5.c
similarity index 100%
rename from sys/crypto/rc5/rc5.c
rename to sys/crypto/rc5.c
diff --git a/sys/crypto/rc5/Makefile b/sys/crypto/rc5/Makefile
deleted file mode 100644
index a78c1bd74ff56facc602014988cfcf605d73ce15..0000000000000000000000000000000000000000
--- a/sys/crypto/rc5/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_rc5
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/sha256/sha256.c b/sys/crypto/sha256.c
similarity index 100%
rename from sys/crypto/sha256/sha256.c
rename to sys/crypto/sha256.c
diff --git a/sys/crypto/sha256/Makefile b/sys/crypto/sha256/Makefile
deleted file mode 100644
index f14689585da50ff1588d2fdc54f11fa6be6424e9..0000000000000000000000000000000000000000
--- a/sys/crypto/sha256/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_sha256
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/skipjack/skipjack.c b/sys/crypto/skipjack.c
similarity index 100%
rename from sys/crypto/skipjack/skipjack.c
rename to sys/crypto/skipjack.c
diff --git a/sys/crypto/skipjack/Makefile b/sys/crypto/skipjack/Makefile
deleted file mode 100644
index 69ce210ded665cea901a995723acc4e16d99efed..0000000000000000000000000000000000000000
--- a/sys/crypto/skipjack/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_skipjack
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/twofish/twofish.c b/sys/crypto/twofish.c
similarity index 100%
rename from sys/crypto/twofish/twofish.c
rename to sys/crypto/twofish.c
diff --git a/sys/crypto/twofish/Makefile b/sys/crypto/twofish/Makefile
deleted file mode 100644
index 18c4e9d0fbbe2488e2faaa91e242e81e50f9a628..0000000000000000000000000000000000000000
--- a/sys/crypto/twofish/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_twofish
-
-include $(RIOTBASE)/Makefile.base
diff --git a/tests/test_sha256/Makefile b/tests/test_sha256/Makefile
index 2a8d1101fe621ff03034ec17c8c06123bb637163..79cd3ed1241d7eb3750d17ba691de9521a43fa23 100644
--- a/tests/test_sha256/Makefile
+++ b/tests/test_sha256/Makefile
@@ -1,7 +1,7 @@
 export PROJECT = test_sha256
 include ../Makefile.tests_common
 
-USEMODULE += crypto_sha256
+USEMODULE += crypto
 
 DISABLE_MODULE += auto_init