diff --git a/app/build.gradle b/app/build.gradle
index a2c71a429..b828daf6b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,7 +130,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'commons-codec:commons-codec:1.15'
     // Encrypt lib
-    implementation project(path: ':encrypt')
+    implementation project(path: ':crypto')
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')
diff --git a/encrypt/.gitignore b/crypto/.gitignore
similarity index 100%
rename from encrypt/.gitignore
rename to crypto/.gitignore
diff --git a/encrypt/build.gradle b/crypto/build.gradle
similarity index 100%
rename from encrypt/build.gradle
rename to crypto/build.gradle
diff --git a/encrypt/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt b/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
similarity index 100%
rename from encrypt/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
rename to crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
diff --git a/encrypt/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt b/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
similarity index 100%
rename from encrypt/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
rename to crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
diff --git a/encrypt/src/main/AndroidManifest.xml b/crypto/src/main/AndroidManifest.xml
similarity index 100%
rename from encrypt/src/main/AndroidManifest.xml
rename to crypto/src/main/AndroidManifest.xml
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt b/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/HashManager.kt b/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/HashManager.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/NativeLib.kt b/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt b/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt b/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt b/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java b/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java b/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt b/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt b/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
similarity index 100%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
diff --git a/encrypt/src/main/jni/.gitignore b/crypto/src/main/jni/.gitignore
similarity index 100%
rename from encrypt/src/main/jni/.gitignore
rename to crypto/src/main/jni/.gitignore
diff --git a/encrypt/src/main/jni/CMakeLists.txt b/crypto/src/main/jni/CMakeLists.txt
similarity index 100%
rename from encrypt/src/main/jni/CMakeLists.txt
rename to crypto/src/main/jni/CMakeLists.txt
diff --git a/encrypt/src/main/jni/final_key/CMakeLists.txt b/crypto/src/main/jni/final_key/CMakeLists.txt
similarity index 100%
rename from encrypt/src/main/jni/final_key/CMakeLists.txt
rename to crypto/src/main/jni/final_key/CMakeLists.txt
diff --git a/encrypt/src/main/jni/final_key/aes/aes.h b/crypto/src/main/jni/final_key/aes/aes.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes.h
rename to crypto/src/main/jni/final_key/aes/aes.h
diff --git a/encrypt/src/main/jni/final_key/aes/aes.txt b/crypto/src/main/jni/final_key/aes/aes.txt
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes.txt
rename to crypto/src/main/jni/final_key/aes/aes.txt
diff --git a/encrypt/src/main/jni/final_key/aes/aes_amd64.asm b/crypto/src/main/jni/final_key/aes/aes_amd64.asm
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes_amd64.asm
rename to crypto/src/main/jni/final_key/aes/aes_amd64.asm
diff --git a/encrypt/src/main/jni/final_key/aes/aes_modes.c b/crypto/src/main/jni/final_key/aes/aes_modes.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes_modes.c
rename to crypto/src/main/jni/final_key/aes/aes_modes.c
diff --git a/encrypt/src/main/jni/final_key/aes/aes_via_ace.h b/crypto/src/main/jni/final_key/aes/aes_via_ace.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes_via_ace.h
rename to crypto/src/main/jni/final_key/aes/aes_via_ace.h
diff --git a/encrypt/src/main/jni/final_key/aes/aes_x86_v1.asm b/crypto/src/main/jni/final_key/aes/aes_x86_v1.asm
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes_x86_v1.asm
rename to crypto/src/main/jni/final_key/aes/aes_x86_v1.asm
diff --git a/encrypt/src/main/jni/final_key/aes/aes_x86_v2.asm b/crypto/src/main/jni/final_key/aes/aes_x86_v2.asm
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aes_x86_v2.asm
rename to crypto/src/main/jni/final_key/aes/aes_x86_v2.asm
diff --git a/encrypt/src/main/jni/final_key/aes/aescpp.h b/crypto/src/main/jni/final_key/aes/aescpp.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aescpp.h
rename to crypto/src/main/jni/final_key/aes/aescpp.h
diff --git a/encrypt/src/main/jni/final_key/aes/aescrypt.c b/crypto/src/main/jni/final_key/aes/aescrypt.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aescrypt.c
rename to crypto/src/main/jni/final_key/aes/aescrypt.c
diff --git a/encrypt/src/main/jni/final_key/aes/aeskey.c b/crypto/src/main/jni/final_key/aes/aeskey.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aeskey.c
rename to crypto/src/main/jni/final_key/aes/aeskey.c
diff --git a/encrypt/src/main/jni/final_key/aes/aesopt.h b/crypto/src/main/jni/final_key/aes/aesopt.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aesopt.h
rename to crypto/src/main/jni/final_key/aes/aesopt.h
diff --git a/encrypt/src/main/jni/final_key/aes/aestab.c b/crypto/src/main/jni/final_key/aes/aestab.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aestab.c
rename to crypto/src/main/jni/final_key/aes/aestab.c
diff --git a/encrypt/src/main/jni/final_key/aes/aestab.h b/crypto/src/main/jni/final_key/aes/aestab.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aestab.h
rename to crypto/src/main/jni/final_key/aes/aestab.h
diff --git a/encrypt/src/main/jni/final_key/aes/aesxam.c b/crypto/src/main/jni/final_key/aes/aesxam.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/aesxam.c
rename to crypto/src/main/jni/final_key/aes/aesxam.c
diff --git a/encrypt/src/main/jni/final_key/aes/brg_endian.h b/crypto/src/main/jni/final_key/aes/brg_endian.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/brg_endian.h
rename to crypto/src/main/jni/final_key/aes/brg_endian.h
diff --git a/encrypt/src/main/jni/final_key/aes/brg_types.h b/crypto/src/main/jni/final_key/aes/brg_types.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/brg_types.h
rename to crypto/src/main/jni/final_key/aes/brg_types.h
diff --git a/encrypt/src/main/jni/final_key/aes/rfc3686.c b/crypto/src/main/jni/final_key/aes/rfc3686.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/rfc3686.c
rename to crypto/src/main/jni/final_key/aes/rfc3686.c
diff --git a/encrypt/src/main/jni/final_key/aes/tablegen.c b/crypto/src/main/jni/final_key/aes/tablegen.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/aes/tablegen.c
rename to crypto/src/main/jni/final_key/aes/tablegen.c
diff --git a/encrypt/src/main/jni/final_key/kpd_jni.c b/crypto/src/main/jni/final_key/kpd_jni.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/kpd_jni.c
rename to crypto/src/main/jni/final_key/kpd_jni.c
diff --git a/encrypt/src/main/jni/final_key/sha/Android.mk b/crypto/src/main/jni/final_key/sha/Android.mk
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/Android.mk
rename to crypto/src/main/jni/final_key/sha/Android.mk
diff --git a/encrypt/src/main/jni/final_key/sha/brg_endian.h b/crypto/src/main/jni/final_key/sha/brg_endian.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/brg_endian.h
rename to crypto/src/main/jni/final_key/sha/brg_endian.h
diff --git a/encrypt/src/main/jni/final_key/sha/brg_types.h b/crypto/src/main/jni/final_key/sha/brg_types.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/brg_types.h
rename to crypto/src/main/jni/final_key/sha/brg_types.h
diff --git a/encrypt/src/main/jni/final_key/sha/hmac.c b/crypto/src/main/jni/final_key/sha/hmac.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/hmac.c
rename to crypto/src/main/jni/final_key/sha/hmac.c
diff --git a/encrypt/src/main/jni/final_key/sha/hmac.h b/crypto/src/main/jni/final_key/sha/hmac.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/hmac.h
rename to crypto/src/main/jni/final_key/sha/hmac.h
diff --git a/encrypt/src/main/jni/final_key/sha/pwd2key.c b/crypto/src/main/jni/final_key/sha/pwd2key.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/pwd2key.c
rename to crypto/src/main/jni/final_key/sha/pwd2key.c
diff --git a/encrypt/src/main/jni/final_key/sha/pwd2key.h b/crypto/src/main/jni/final_key/sha/pwd2key.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/pwd2key.h
rename to crypto/src/main/jni/final_key/sha/pwd2key.h
diff --git a/encrypt/src/main/jni/final_key/sha/sha1.c b/crypto/src/main/jni/final_key/sha/sha1.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/sha1.c
rename to crypto/src/main/jni/final_key/sha/sha1.c
diff --git a/encrypt/src/main/jni/final_key/sha/sha1.h b/crypto/src/main/jni/final_key/sha/sha1.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/sha1.h
rename to crypto/src/main/jni/final_key/sha/sha1.h
diff --git a/encrypt/src/main/jni/final_key/sha/sha2.c b/crypto/src/main/jni/final_key/sha/sha2.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/sha2.c
rename to crypto/src/main/jni/final_key/sha/sha2.c
diff --git a/encrypt/src/main/jni/final_key/sha/sha2.h b/crypto/src/main/jni/final_key/sha/sha2.h
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/sha2.h
rename to crypto/src/main/jni/final_key/sha/sha2.h
diff --git a/encrypt/src/main/jni/final_key/sha/shasum.c b/crypto/src/main/jni/final_key/sha/shasum.c
similarity index 100%
rename from encrypt/src/main/jni/final_key/sha/shasum.c
rename to crypto/src/main/jni/final_key/sha/shasum.c
diff --git a/encrypt/src/main/res/values/strings.xml b/crypto/src/main/res/values/strings.xml
similarity index 100%
rename from encrypt/src/main/res/values/strings.xml
rename to crypto/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
index 9bfaf08a8..a8916a099 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':icon-pack-classic', ':icon-pack-material', ':encrypt'
+include ':app', ':icon-pack-classic', ':icon-pack-material', ':crypto'