diff --git a/README.md b/README.md
index 9c9cafd7f6a1de7e3384914f3296f6ec7c408cfc..d3ae2ed25502511d03b9731890d9e8742a7022bb 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ allprojects {
 
 ```
 dependencies {
-    implementation(' ')
+    implementation project(path: ':securestoragelibrary')
 }
 ```
 
diff --git a/entry/src/main/config.json b/entry/src/main/config.json
index 359742354dc333c526f2bb6b2d6366c11fea340f..e54136ea0f136c9d13f58d25e542d9885c26c792 100644
--- a/entry/src/main/config.json
+++ b/entry/src/main/config.json
@@ -13,7 +13,7 @@
   },
   "deviceConfig": {},
   "module": {
-    "package": "com.de.adorsys.ohos.securestoragetest",
+    "package": "de.adorsys.ohos.securestoragetest",
     "name": ".MyApplication",
     "deviceType": [
       "phone"
@@ -36,7 +36,7 @@
           }
         ],
         "orientation": "unspecified",
-        "name": "com.de.adorsys.ohos.securestoragetest.MainAbility",
+        "name": "de.adorsys.ohos.securestoragetest.MainAbility",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:app_name",
diff --git a/entry/src/main/java/com/de/adorsys/ohos/securestoragetest/MainAbility.java b/entry/src/main/java/de/adorsys/ohos/securestoragetest/MainAbility.java
similarity index 89%
rename from entry/src/main/java/com/de/adorsys/ohos/securestoragetest/MainAbility.java
rename to entry/src/main/java/de/adorsys/ohos/securestoragetest/MainAbility.java
index de0e33bc3170f04c9ba7f55d0c3b620fb534ce5c..85a391ddd60c781ecfc4b4cf9195573b2a439fae 100644
--- a/entry/src/main/java/com/de/adorsys/ohos/securestoragetest/MainAbility.java
+++ b/entry/src/main/java/de/adorsys/ohos/securestoragetest/MainAbility.java
@@ -14,9 +14,9 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragetest;
+package de.adorsys.ohos.securestoragetest;
 
-import com.de.adorsys.ohos.securestoragetest.slice.MainAbilitySlice;
+import de.adorsys.ohos.securestoragetest.slice.MainAbilitySlice;
 import ohos.aafwk.ability.Ability;
 import ohos.aafwk.content.Intent;
 
diff --git a/entry/src/main/java/com/de/adorsys/ohos/securestoragetest/MyApplication.java b/entry/src/main/java/de/adorsys/ohos/securestoragetest/MyApplication.java
similarity index 94%
rename from entry/src/main/java/com/de/adorsys/ohos/securestoragetest/MyApplication.java
rename to entry/src/main/java/de/adorsys/ohos/securestoragetest/MyApplication.java
index 0fd1615c9fe2eb10f59eed230a78c06ad7b958f5..9cab4b89f364d9e909bd18b4be9d0c2342620d92 100644
--- a/entry/src/main/java/com/de/adorsys/ohos/securestoragetest/MyApplication.java
+++ b/entry/src/main/java/de/adorsys/ohos/securestoragetest/MyApplication.java
@@ -14,7 +14,7 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragetest;
+package de.adorsys.ohos.securestoragetest;
 
 import ohos.aafwk.ability.AbilityPackage;
 
diff --git a/entry/src/main/java/com/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java b/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java
similarity index 97%
rename from entry/src/main/java/com/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java
rename to entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java
index bd5e91750d691961fc2cb9e11c5544cc8bef179a..b19da4f77e6d38ebd4a05d1a7e52f71eccd3451e 100644
--- a/entry/src/main/java/com/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java
+++ b/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java
@@ -14,10 +14,10 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragetest.slice;
+package de.adorsys.ohos.securestoragetest.slice;
 
-import com.de.adorsys.ohos.securestoragelibrary.SecurePreferences;
-import com.de.adorsys.ohos.securestoragelibrary.SecureStorageException;
+import de.adorsys.ohos.securestoragelibrary.SecurePreferences;
+import de.adorsys.ohos.securestoragelibrary.SecureStorageException;
 import com.de.adorsys.ohos.securestoragetest.ResourceTable;
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json
index 5e728998d27f8793bae98682a35781dc49ba6a26..7b1e42aee460c9264054fa9ca91a457661b0297f 100644
--- a/entry/src/ohosTest/config.json
+++ b/entry/src/ohosTest/config.json
@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "de.adorsys.android.securestoragetest",
+    "bundleName": "de.adorsys.ohos.securestoragetest",
     "vendor": "adorsys",
     "version": {
       "code": 1,
@@ -14,7 +14,7 @@
   },
   "deviceConfig": {},
   "module": {
-    "package": "de.adorsys.android.securestoragetest",
+    "package": "de.adorsys.ohos.securestoragetest",
     "name": "testModule",
     "deviceType": [
       "phone"
diff --git a/entry/src/ohosTest/java/com/de/adorsys/ohos/securestoragetest/ExampleOhosTest.java b/entry/src/ohosTest/java/de/adorsys/android/securestoragetest/ExampleOhosTest.java
similarity index 96%
rename from entry/src/ohosTest/java/com/de/adorsys/ohos/securestoragetest/ExampleOhosTest.java
rename to entry/src/ohosTest/java/de/adorsys/android/securestoragetest/ExampleOhosTest.java
index 648d974fba70da57a2d8bf73814a8caf94d7a7e4..1aa5bfbd3be0582c28b49cc41239387c701a6d65 100644
--- a/entry/src/ohosTest/java/com/de/adorsys/ohos/securestoragetest/ExampleOhosTest.java
+++ b/entry/src/ohosTest/java/de/adorsys/android/securestoragetest/ExampleOhosTest.java
@@ -14,7 +14,7 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragetest;
+package de.adorsys.android.securestoragetest;
 
 import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry;
 import org.junit.Test;
@@ -43,7 +43,7 @@ public class ExampleOhosTest {
     @Test
     public void initButtonMethod(){
         try {
-            Class mainAbilitySlice = Class.forName("com.de.adorsys.ohos.securestoragetest.slice.MainAbilitySlice");
+            Class mainAbilitySlice = Class.forName("de.adorsys.ohos.securestoragetest.slice.MainAbilitySlice");
             Method initButton = mainAbilitySlice.getMethod("initButton");
             Object object = mainAbilitySlice.getConstructor().newInstance();
             initButton.invoke(object);
diff --git a/gif/0.gif b/gif/0.gif
index 42006bd098881d2bf22351fd64c642f4534978ea..b7735a75b93f073aaaa371f075af9402a5b389c9 100644
Binary files a/gif/0.gif and b/gif/0.gif differ
diff --git a/securestoragelibrary/src/main/config.json b/securestoragelibrary/src/main/config.json
index 61f0367c18d0e4870f066ad2b5c6a8f7084c12a7..d8836791c7882b4e49f57f7d00384acb220a251c 100644
--- a/securestoragelibrary/src/main/config.json
+++ b/securestoragelibrary/src/main/config.json
@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "de.adorsys.android.securestoragetest",
+    "bundleName": "de.adorsys.ohos.securestoragetest",
     "vendor": "adorsys",
     "version": {
       "code": 1,
@@ -9,12 +9,12 @@
     "apiVersion": {
       "compatible": 5,
       "target": 5,
-      "releaseType": "Beta1"
+      "releaseType": "Release"
     }
   },
   "deviceConfig": {},
   "module": {
-    "package": "com.de.adorsys.ohos.securestoragelibrary",
+    "package": "de.adorsys.ohos.securestoragelibrary",
     "deviceType": [
       "phone"
     ],
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/IoUtils.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/IoUtils.java
similarity index 98%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/IoUtils.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/IoUtils.java
index 469b1f66259c732a6bd5f8998c4663507cc419ca..50fad9d6c9adb111b9c082a20760127aff5f1bc4 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/IoUtils.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/IoUtils.java
@@ -14,7 +14,7 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/KeystoreTool.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/KeystoreTool.java
similarity index 93%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/KeystoreTool.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/KeystoreTool.java
index 7870d930bdee0bb302abf97540db61101ceb8235..8b4be9eacec5d9801c4828b39f8f4f36cc42f862 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/KeystoreTool.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/KeystoreTool.java
@@ -1,5 +1,6 @@
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
+import com.de.adorsys.ohos.securestoragelibrary.ResourceTable;
 import ohos.agp.render.render3d.BuildConfig;
 import ohos.app.Context;
 import ohos.app.Environment;
@@ -14,8 +15,9 @@ import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.util.Base64;
 
-import static com.de.adorsys.ohos.securestoragelibrary.SecureStorageException.ExceptionType.CRYPTO_EXCEPTION;
-import static com.de.adorsys.ohos.securestoragelibrary.SecureStorageException.ExceptionType.KEYSTORE_EXCEPTION;
+import static de.adorsys.ohos.securestoragelibrary.SecureStorageException.ExceptionType.CRYPTO_EXCEPTION;
+import static de.adorsys.ohos.securestoragelibrary.SecureStorageException.ExceptionType.KEYSTORE_EXCEPTION;
+
 
 public final class KeystoreTool {
     private static final HiLogLabel LABEL = new HiLogLabel(HiLog.LOG_APP, 0x000110, "KeystoreTool");
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
similarity index 99%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
index 8609ede2cd54ffadfaac6cd9261ad9c875b9a695..d45397627e2995193de02f294973f2efb2f9ce5c 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
@@ -1,4 +1,4 @@
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/PreferenceUtils.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PreferenceUtils.java
similarity index 98%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/PreferenceUtils.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PreferenceUtils.java
index 860b6c938d5bf17acc7314c29715a6e5fad5c5ba..36613d7c7f1311a433d4814170de47b080b4e524 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/PreferenceUtils.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PreferenceUtils.java
@@ -14,7 +14,7 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 import ohos.app.Context;
 import ohos.data.DatabaseHelper;
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/RsaUtils.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/RsaUtils.java
similarity index 99%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/RsaUtils.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/RsaUtils.java
index 9da037ab694ad83c0695ea844e3e3a7e215db522..8ad4e89e9d1e49bc234d5a67172cf58bf6caa1a0 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/RsaUtils.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/RsaUtils.java
@@ -14,7 +14,7 @@
  *
  */
 
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
similarity index 98%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
index 926ec3c33b0d20829d3655a08a5235682b231bfc..d2055baf4a324d16ce423ac946a866e76716ec80 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
@@ -1,4 +1,4 @@
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 import ohos.app.Context;
 import ohos.data.DatabaseHelper;
@@ -9,7 +9,8 @@ import ohos.hiviewdfx.HiLogLabel;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.de.adorsys.ohos.securestoragelibrary.SecureStorageException.ExceptionType.CRYPTO_EXCEPTION;
+import static de.adorsys.ohos.securestoragelibrary.SecureStorageException.ExceptionType.CRYPTO_EXCEPTION;
+
 
 /**
  * Handles every use case for the developer using Secure Storage.
diff --git a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/SecureStorageException.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecureStorageException.java
similarity index 97%
rename from securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/SecureStorageException.java
rename to securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecureStorageException.java
index ccbf7b5205e16aebb130d2753e18f4a83f071191..84ea207e0cba17103a19d433305ca6dab98ca003 100644
--- a/securestoragelibrary/src/main/java/com/de/adorsys/ohos/securestoragelibrary/SecureStorageException.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecureStorageException.java
@@ -1,4 +1,4 @@
-package com.de.adorsys.ohos.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 /**
  * Useful for catching possible exceptions thrown internally in the library so the user knows what to expect