diff --git a/app/build.gradle b/app/build.gradle
index 445f5b722..40779b14f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,6 +131,9 @@ dependencies {
     implementation 'me.gosimple:nbvcxz:1.5.0'
     // Encrypt lib
     implementation project(path: ':crypto')
+    
+    implementation project(path: ':database')
+
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')
diff --git a/database/.gitignore b/database/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/database/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/database/build.gradle b/database/build.gradle
new file mode 100644
index 000000000..1cc7e8948
--- /dev/null
+++ b/database/build.gradle
@@ -0,0 +1,54 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
+    ndkVersion "21.4.7075529"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdk 32
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        buildConfigField "String[]", "ICON_PACKS", "{\"classic\",\"material\"}"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "androidx.core:core-ktx:$android_core_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    // Color
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.6'
+    // Time
+    implementation 'joda-time:joda-time:2.10.13'
+    // Apache Commons
+    implementation 'commons-io:commons-io:2.8.0'
+    implementation 'commons-codec:commons-codec:1.15'
+    // Icon pack
+    implementation project(path: ':icon-pack-classic')
+    implementation project(path: ':icon-pack-material')
+
+    implementation project(path: ':crypto')
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+}
diff --git a/database/consumer-rules.pro b/database/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/database/proguard-rules.pro b/database/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/database/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/database/src/androidTest/java/com/kunzisoft/keepass/database/ExampleInstrumentedTest.kt b/database/src/androidTest/java/com/kunzisoft/keepass/database/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..d446581fe
--- /dev/null
+++ b/database/src/androidTest/java/com/kunzisoft/keepass/database/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.kunzisoft.keepass.database
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.kunzisoft.keepass.database.test", appContext.packageName)
+    }
+}
diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..2155129cd
--- /dev/null
+++ b/database/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.kunzisoft.keepass.database" />
diff --git a/database/src/test/java/com/kunzisoft/keepass/database/ExampleUnitTest.kt b/database/src/test/java/com/kunzisoft/keepass/database/ExampleUnitTest.kt
new file mode 100644
index 000000000..0aca27bf9
--- /dev/null
+++ b/database/src/test/java/com/kunzisoft/keepass/database/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.kunzisoft.keepass.database
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index a8916a099..bd16a5917 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app', ':icon-pack-classic', ':icon-pack-material', ':crypto'
+include ':database'