diff --git a/database/crypto/.gitignore b/crypto/.gitignore
similarity index 100%
rename from database/crypto/.gitignore
rename to crypto/.gitignore
diff --git a/database/crypto/build.gradle b/crypto/build.gradle
similarity index 100%
rename from database/crypto/build.gradle
rename to crypto/build.gradle
diff --git a/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt b/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
similarity index 100%
rename from database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
rename to crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
diff --git a/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt b/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
similarity index 100%
rename from database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
rename to crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
diff --git a/crypto/src/main/AndroidManifest.xml b/crypto/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..019804ab2
--- /dev/null
+++ b/crypto/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.kunzisoft.encrypt" />
diff --git a/database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt b/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
similarity index 100%
rename from database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
diff --git a/database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt b/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
similarity index 100%
rename from database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
diff --git a/database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt b/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
similarity index 100%
rename from database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
diff --git a/database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt b/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
similarity index 100%
rename from database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
diff --git a/database/crypto/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 database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
diff --git a/database/crypto/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 database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
diff --git a/database/crypto/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 database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
diff --git a/database/crypto/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 database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
rename to crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
diff --git a/database/crypto/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 database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
diff --git a/database/crypto/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 database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
rename to crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
diff --git a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java b/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
similarity index 100%
rename from database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
rename to crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
diff --git a/database/crypto/src/main/jni/.gitignore b/crypto/src/main/jni/.gitignore
similarity index 100%
rename from database/crypto/src/main/jni/.gitignore
rename to crypto/src/main/jni/.gitignore
diff --git a/database/crypto/src/main/jni/CMakeLists.txt b/crypto/src/main/jni/CMakeLists.txt
similarity index 100%
rename from database/crypto/src/main/jni/CMakeLists.txt
rename to crypto/src/main/jni/CMakeLists.txt
diff --git a/database/crypto/src/main/jni/aes/CMakeLists.txt b/crypto/src/main/jni/aes/CMakeLists.txt
similarity index 100%
rename from database/crypto/src/main/jni/aes/CMakeLists.txt
rename to crypto/src/main/jni/aes/CMakeLists.txt
diff --git a/database/crypto/src/main/jni/aes/aes/aes.h b/crypto/src/main/jni/aes/aes/aes.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes.h
rename to crypto/src/main/jni/aes/aes/aes.h
diff --git a/database/crypto/src/main/jni/aes/aes/aes.txt b/crypto/src/main/jni/aes/aes/aes.txt
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes.txt
rename to crypto/src/main/jni/aes/aes/aes.txt
diff --git a/database/crypto/src/main/jni/aes/aes/aes_amd64.asm b/crypto/src/main/jni/aes/aes/aes_amd64.asm
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes_amd64.asm
rename to crypto/src/main/jni/aes/aes/aes_amd64.asm
diff --git a/database/crypto/src/main/jni/aes/aes/aes_modes.c b/crypto/src/main/jni/aes/aes/aes_modes.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes_modes.c
rename to crypto/src/main/jni/aes/aes/aes_modes.c
diff --git a/database/crypto/src/main/jni/aes/aes/aes_via_ace.h b/crypto/src/main/jni/aes/aes/aes_via_ace.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes_via_ace.h
rename to crypto/src/main/jni/aes/aes/aes_via_ace.h
diff --git a/database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm b/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
rename to crypto/src/main/jni/aes/aes/aes_x86_v1.asm
diff --git a/database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm b/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
rename to crypto/src/main/jni/aes/aes/aes_x86_v2.asm
diff --git a/database/crypto/src/main/jni/aes/aes/aescpp.h b/crypto/src/main/jni/aes/aes/aescpp.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aescpp.h
rename to crypto/src/main/jni/aes/aes/aescpp.h
diff --git a/database/crypto/src/main/jni/aes/aes/aescrypt.c b/crypto/src/main/jni/aes/aes/aescrypt.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aescrypt.c
rename to crypto/src/main/jni/aes/aes/aescrypt.c
diff --git a/database/crypto/src/main/jni/aes/aes/aeskey.c b/crypto/src/main/jni/aes/aes/aeskey.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aeskey.c
rename to crypto/src/main/jni/aes/aes/aeskey.c
diff --git a/database/crypto/src/main/jni/aes/aes/aesopt.h b/crypto/src/main/jni/aes/aes/aesopt.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aesopt.h
rename to crypto/src/main/jni/aes/aes/aesopt.h
diff --git a/database/crypto/src/main/jni/aes/aes/aestab.c b/crypto/src/main/jni/aes/aes/aestab.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aestab.c
rename to crypto/src/main/jni/aes/aes/aestab.c
diff --git a/database/crypto/src/main/jni/aes/aes/aestab.h b/crypto/src/main/jni/aes/aes/aestab.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aestab.h
rename to crypto/src/main/jni/aes/aes/aestab.h
diff --git a/database/crypto/src/main/jni/aes/aes/aesxam.c b/crypto/src/main/jni/aes/aes/aesxam.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/aesxam.c
rename to crypto/src/main/jni/aes/aes/aesxam.c
diff --git a/database/crypto/src/main/jni/aes/aes/brg_endian.h b/crypto/src/main/jni/aes/aes/brg_endian.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/brg_endian.h
rename to crypto/src/main/jni/aes/aes/brg_endian.h
diff --git a/database/crypto/src/main/jni/aes/aes/brg_types.h b/crypto/src/main/jni/aes/aes/brg_types.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/brg_types.h
rename to crypto/src/main/jni/aes/aes/brg_types.h
diff --git a/database/crypto/src/main/jni/aes/aes/rfc3686.c b/crypto/src/main/jni/aes/aes/rfc3686.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/rfc3686.c
rename to crypto/src/main/jni/aes/aes/rfc3686.c
diff --git a/database/crypto/src/main/jni/aes/aes/tablegen.c b/crypto/src/main/jni/aes/aes/tablegen.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/tablegen.c
rename to crypto/src/main/jni/aes/aes/tablegen.c
diff --git a/database/crypto/src/main/jni/aes/aes/vb.txt b/crypto/src/main/jni/aes/aes/vb.txt
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/vb.txt
rename to crypto/src/main/jni/aes/aes/vb.txt
diff --git a/database/crypto/src/main/jni/aes/aes/vbaxam.doc b/crypto/src/main/jni/aes/aes/vbaxam.doc
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/vbaxam.doc
rename to crypto/src/main/jni/aes/aes/vbaxam.doc
diff --git a/database/crypto/src/main/jni/aes/aes/via_ace.txt b/crypto/src/main/jni/aes/aes/via_ace.txt
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes/via_ace.txt
rename to crypto/src/main/jni/aes/aes/via_ace.txt
diff --git a/database/crypto/src/main/jni/aes/aes_jni.c b/crypto/src/main/jni/aes/aes_jni.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/aes_jni.c
rename to crypto/src/main/jni/aes/aes_jni.c
diff --git a/database/crypto/src/main/jni/aes/sha/Android.mk b/crypto/src/main/jni/aes/sha/Android.mk
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/Android.mk
rename to crypto/src/main/jni/aes/sha/Android.mk
diff --git a/database/crypto/src/main/jni/aes/sha/brg_endian.h b/crypto/src/main/jni/aes/sha/brg_endian.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/brg_endian.h
rename to crypto/src/main/jni/aes/sha/brg_endian.h
diff --git a/database/crypto/src/main/jni/aes/sha/brg_types.h b/crypto/src/main/jni/aes/sha/brg_types.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/brg_types.h
rename to crypto/src/main/jni/aes/sha/brg_types.h
diff --git a/database/crypto/src/main/jni/aes/sha/hmac.c b/crypto/src/main/jni/aes/sha/hmac.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/hmac.c
rename to crypto/src/main/jni/aes/sha/hmac.c
diff --git a/database/crypto/src/main/jni/aes/sha/hmac.h b/crypto/src/main/jni/aes/sha/hmac.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/hmac.h
rename to crypto/src/main/jni/aes/sha/hmac.h
diff --git a/database/crypto/src/main/jni/aes/sha/pwd2key.c b/crypto/src/main/jni/aes/sha/pwd2key.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/pwd2key.c
rename to crypto/src/main/jni/aes/sha/pwd2key.c
diff --git a/database/crypto/src/main/jni/aes/sha/pwd2key.h b/crypto/src/main/jni/aes/sha/pwd2key.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/pwd2key.h
rename to crypto/src/main/jni/aes/sha/pwd2key.h
diff --git a/database/crypto/src/main/jni/aes/sha/sha1.c b/crypto/src/main/jni/aes/sha/sha1.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/sha1.c
rename to crypto/src/main/jni/aes/sha/sha1.c
diff --git a/database/crypto/src/main/jni/aes/sha/sha1.h b/crypto/src/main/jni/aes/sha/sha1.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/sha1.h
rename to crypto/src/main/jni/aes/sha/sha1.h
diff --git a/database/crypto/src/main/jni/aes/sha/sha1b.c b/crypto/src/main/jni/aes/sha/sha1b.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/sha1b.c
rename to crypto/src/main/jni/aes/sha/sha1b.c
diff --git a/database/crypto/src/main/jni/aes/sha/sha2.c b/crypto/src/main/jni/aes/sha/sha2.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/sha2.c
rename to crypto/src/main/jni/aes/sha/sha2.c
diff --git a/database/crypto/src/main/jni/aes/sha/sha2.h b/crypto/src/main/jni/aes/sha/sha2.h
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/sha2.h
rename to crypto/src/main/jni/aes/sha/sha2.h
diff --git a/database/crypto/src/main/jni/aes/sha/sha2b.c b/crypto/src/main/jni/aes/sha/sha2b.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/sha2b.c
rename to crypto/src/main/jni/aes/sha/sha2b.c
diff --git a/database/crypto/src/main/jni/aes/sha/shasum.c b/crypto/src/main/jni/aes/sha/shasum.c
similarity index 100%
rename from database/crypto/src/main/jni/aes/sha/shasum.c
rename to crypto/src/main/jni/aes/sha/shasum.c
diff --git a/database/crypto/src/main/jni/argon2/CMakeLists.txt b/crypto/src/main/jni/argon2/CMakeLists.txt
similarity index 100%
rename from database/crypto/src/main/jni/argon2/CMakeLists.txt
rename to crypto/src/main/jni/argon2/CMakeLists.txt
diff --git a/database/crypto/src/main/jni/argon2/argon2_jni.c b/crypto/src/main/jni/argon2/argon2_jni.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/argon2_jni.c
rename to crypto/src/main/jni/argon2/argon2_jni.c
diff --git a/database/crypto/src/main/jni/argon2/include/argon2.h b/crypto/src/main/jni/argon2/include/argon2.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/include/argon2.h
rename to crypto/src/main/jni/argon2/include/argon2.h
diff --git a/database/crypto/src/main/jni/argon2/src/CMakeLists.txt b/crypto/src/main/jni/argon2/src/CMakeLists.txt
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/CMakeLists.txt
rename to crypto/src/main/jni/argon2/src/CMakeLists.txt
diff --git a/database/crypto/src/main/jni/argon2/src/argon2.c b/crypto/src/main/jni/argon2/src/argon2.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/argon2.c
rename to crypto/src/main/jni/argon2/src/argon2.c
diff --git a/database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h b/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
rename to crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
diff --git a/database/crypto/src/main/jni/argon2/src/blake2/blake2.h b/crypto/src/main/jni/argon2/src/blake2/blake2.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/blake2/blake2.h
rename to crypto/src/main/jni/argon2/src/blake2/blake2.h
diff --git a/database/crypto/src/main/jni/argon2/src/blake2/blake2b.c b/crypto/src/main/jni/argon2/src/blake2/blake2b.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
rename to crypto/src/main/jni/argon2/src/blake2/blake2b.c
diff --git a/database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h b/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
rename to crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
diff --git a/database/crypto/src/main/jni/argon2/src/core.c b/crypto/src/main/jni/argon2/src/core.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/core.c
rename to crypto/src/main/jni/argon2/src/core.c
diff --git a/database/crypto/src/main/jni/argon2/src/core.h b/crypto/src/main/jni/argon2/src/core.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/core.h
rename to crypto/src/main/jni/argon2/src/core.h
diff --git a/database/crypto/src/main/jni/argon2/src/encoding.c b/crypto/src/main/jni/argon2/src/encoding.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/encoding.c
rename to crypto/src/main/jni/argon2/src/encoding.c
diff --git a/database/crypto/src/main/jni/argon2/src/encoding.h b/crypto/src/main/jni/argon2/src/encoding.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/encoding.h
rename to crypto/src/main/jni/argon2/src/encoding.h
diff --git a/database/crypto/src/main/jni/argon2/src/opt.c b/crypto/src/main/jni/argon2/src/opt.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/opt.c
rename to crypto/src/main/jni/argon2/src/opt.c
diff --git a/database/crypto/src/main/jni/argon2/src/opt.h b/crypto/src/main/jni/argon2/src/opt.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/opt.h
rename to crypto/src/main/jni/argon2/src/opt.h
diff --git a/database/crypto/src/main/jni/argon2/src/ref.c b/crypto/src/main/jni/argon2/src/ref.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/ref.c
rename to crypto/src/main/jni/argon2/src/ref.c
diff --git a/database/crypto/src/main/jni/argon2/src/ref.h b/crypto/src/main/jni/argon2/src/ref.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/ref.h
rename to crypto/src/main/jni/argon2/src/ref.h
diff --git a/database/crypto/src/main/jni/argon2/src/thread.c b/crypto/src/main/jni/argon2/src/thread.c
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/thread.c
rename to crypto/src/main/jni/argon2/src/thread.c
diff --git a/database/crypto/src/main/jni/argon2/src/thread.h b/crypto/src/main/jni/argon2/src/thread.h
similarity index 100%
rename from database/crypto/src/main/jni/argon2/src/thread.h
rename to crypto/src/main/jni/argon2/src/thread.h
diff --git a/database/build.gradle b/database/build.gradle
index bace6f8ff..f0cdf19d2 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'commons-codec:commons-codec:1.15'
 
-    implementation project(path: ':database:crypto')
+    implementation project(path: ':crypto')
 
     // Tests
     androidTestImplementation "androidx.test:runner:$android_test_version"
diff --git a/database/crypto/src/main/AndroidManifest.xml b/database/crypto/src/main/AndroidManifest.xml
deleted file mode 100644
index 46b0e5139..000000000
--- a/database/crypto/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kunzisoft.encrypt">
-
-</manifest>
diff --git a/settings.gradle b/settings.gradle
index 14761c683..9611dc908 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
 include ':app'
-include ':database', ':database:crypto'
+include ':database'
+include ':crypto'
 include ':icon-pack', ':icon-pack:classic', ':icon-pack:material'