diff --git a/libraries/Crypto/examples/TestEAX/TestEAX.ino b/libraries/Crypto/examples/TestEAX/TestEAX.ino
index e33191bc..fadea5d1 100644
--- a/libraries/Crypto/examples/TestEAX/TestEAX.ino
+++ b/libraries/Crypto/examples/TestEAX/TestEAX.ino
@@ -25,6 +25,7 @@ This example runs tests on the EAX implementation to verify correct behaviour.
 */
 
 #include <Crypto.h>
+#include <CryptoLW.h>
 #include <EAX.h>
 #include <AES.h>
 #include <Speck.h>
diff --git a/libraries/Crypto/examples/TestGCM/TestGCM.ino b/libraries/Crypto/examples/TestGCM/TestGCM.ino
index a47bfd6a..5692314d 100644
--- a/libraries/Crypto/examples/TestGCM/TestGCM.ino
+++ b/libraries/Crypto/examples/TestGCM/TestGCM.ino
@@ -25,6 +25,7 @@ This example runs tests on the GCM implementation to verify correct behaviour.
 */
 
 #include <Crypto.h>
+#include <CryptoLW.h>
 #include <AES.h>
 #include <Speck.h>
 #include <SpeckTiny.h>
diff --git a/libraries/Crypto/examples/TestXTS/TestXTS.ino b/libraries/Crypto/examples/TestXTS/TestXTS.ino
index 8ea04fec..ad1064e8 100644
--- a/libraries/Crypto/examples/TestXTS/TestXTS.ino
+++ b/libraries/Crypto/examples/TestXTS/TestXTS.ino
@@ -25,6 +25,7 @@ This example runs tests on the XTS implementation to verify correct behaviour.
 */
 
 #include <Crypto.h>
+#include <CryptoLW.h>
 #include <AES.h>
 #include <Speck.h>
 #include <SpeckSmall.h>
diff --git a/libraries/Crypto/keywords.txt b/libraries/Crypto/keywords.txt
index 6f28a226..068542fc 100644
--- a/libraries/Crypto/keywords.txt
+++ b/libraries/Crypto/keywords.txt
@@ -5,9 +5,6 @@ AESTiny128	KEYWORD1
 AESTiny256	KEYWORD1
 AESSmall128	KEYWORD1
 AESSmall256	KEYWORD1
-Speck	KEYWORD1
-SpeckTiny	KEYWORD1
-SpeckSmall	KEYWORD1
 ChaCha	KEYWORD1
 ChaChaPoly	KEYWORD1
 
diff --git a/libraries/Crypto/examples/TestSpeck/TestSpeck.ino b/libraries/CryptoLW/examples/TestSpeck/TestSpeck.ino
similarity index 100%
rename from libraries/Crypto/examples/TestSpeck/TestSpeck.ino
rename to libraries/CryptoLW/examples/TestSpeck/TestSpeck.ino
diff --git a/libraries/CryptoLW/keywords.txt b/libraries/CryptoLW/keywords.txt
index 79ccb087..ee400604 100644
--- a/libraries/CryptoLW/keywords.txt
+++ b/libraries/CryptoLW/keywords.txt
@@ -1 +1,4 @@
 Acorn128	KEYWORD1
+Speck	KEYWORD1
+SpeckSmall	KEYWORD1
+SpeckTiny	KEYWORD1
diff --git a/libraries/CryptoLW/library.json b/libraries/CryptoLW/library.json
index 9f6c9f2d..4a895c46 100644
--- a/libraries/CryptoLW/library.json
+++ b/libraries/CryptoLW/library.json
@@ -1,7 +1,7 @@
 {
     "name": "CryptoLW",
     "version": "0.1.6",
-    "keywords": "Acorn128",
+    "keywords": "Acorn128,Speck,SpeckSmall,SpeckTiny",
     "description": "Light-weight ciphers for the Arduino Cryptography Library",
     "authors":
     {
diff --git a/libraries/Crypto/Speck.cpp b/libraries/CryptoLW/src/Speck.cpp
similarity index 100%
rename from libraries/Crypto/Speck.cpp
rename to libraries/CryptoLW/src/Speck.cpp
diff --git a/libraries/Crypto/Speck.h b/libraries/CryptoLW/src/Speck.h
similarity index 100%
rename from libraries/Crypto/Speck.h
rename to libraries/CryptoLW/src/Speck.h
diff --git a/libraries/Crypto/SpeckSmall.cpp b/libraries/CryptoLW/src/SpeckSmall.cpp
similarity index 100%
rename from libraries/Crypto/SpeckSmall.cpp
rename to libraries/CryptoLW/src/SpeckSmall.cpp
diff --git a/libraries/Crypto/SpeckSmall.h b/libraries/CryptoLW/src/SpeckSmall.h
similarity index 100%
rename from libraries/Crypto/SpeckSmall.h
rename to libraries/CryptoLW/src/SpeckSmall.h
diff --git a/libraries/Crypto/SpeckTiny.cpp b/libraries/CryptoLW/src/SpeckTiny.cpp
similarity index 100%
rename from libraries/Crypto/SpeckTiny.cpp
rename to libraries/CryptoLW/src/SpeckTiny.cpp
diff --git a/libraries/Crypto/SpeckTiny.h b/libraries/CryptoLW/src/SpeckTiny.h
similarity index 100%
rename from libraries/Crypto/SpeckTiny.h
rename to libraries/CryptoLW/src/SpeckTiny.h