diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/LibrariesActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/LibrariesActivity.java
index 4ad15b7..a0c6b1d 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/LibrariesActivity.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/LibrariesActivity.java
@@ -1,5 +1,12 @@
 package com.fatapp.oxygentoolbox.ui.about;
 
+import android.app.SearchManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
@@ -8,18 +15,11 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.app.SearchManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-
 import com.fatapp.oxygentoolbox.R;
 import com.fatapp.oxygentoolbox.ui.about.util.LibrariesAdapter;
-import com.fatapp.oxygentoolbox.util.DependenciesJson;
 import com.fatapp.oxygentoolbox.util.MultiLanguageUtils;
 import com.fatapp.oxygentoolbox.util.ResourceUtil;
+import com.fatapp.oxygentoolbox.util.json.DependenciesJson;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java
index 523a768..1662a3b 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java
@@ -16,9 +16,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.fatapp.oxygentoolbox.R;
-import com.fatapp.oxygentoolbox.util.DependenciesJson;
-import com.fatapp.oxygentoolbox.util.LicenseJson;
 import com.fatapp.oxygentoolbox.util.ResourceUtil;
+import com.fatapp.oxygentoolbox.util.json.DependenciesJson;
+import com.fatapp.oxygentoolbox.util.json.LicenseJson;
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.Gson;
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java
index 86268ea..d0614f3 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java
@@ -1,9 +1,6 @@
 package com.fatapp.oxygentoolbox.ui.setting;
 
-import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.Bundle;
-import android.util.Log;
 
 import androidx.annotation.Nullable;
 import androidx.navigation.Navigation;
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java
index 0d29d96..e24ce48 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java
@@ -1,5 +1,6 @@
 package com.fatapp.oxygentoolbox.util;
 
+import com.fatapp.oxygentoolbox.util.json.ToolsJson;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/DependenciesJson.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/json/DependenciesJson.java
similarity index 98%
rename from app/src/main/java/com/fatapp/oxygentoolbox/util/DependenciesJson.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/util/json/DependenciesJson.java
index 6e94e6c..1e896fa 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/util/DependenciesJson.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/json/DependenciesJson.java
@@ -1,4 +1,4 @@
-package com.fatapp.oxygentoolbox.util;
+package com.fatapp.oxygentoolbox.util.json;
 
 import com.google.gson.JsonParser;
 import com.google.gson.TypeAdapter;
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/LicenseJson.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/json/LicenseJson.java
similarity index 94%
rename from app/src/main/java/com/fatapp/oxygentoolbox/util/LicenseJson.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/util/json/LicenseJson.java
index cdd51a4..ff00a1b 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/util/LicenseJson.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/json/LicenseJson.java
@@ -1,4 +1,4 @@
-package com.fatapp.oxygentoolbox.util;
+package com.fatapp.oxygentoolbox.util.json;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/json/ToolsJson.java
similarity index 98%
rename from app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/util/json/ToolsJson.java
index 4c0c5aa..76abde7 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/json/ToolsJson.java
@@ -1,5 +1,6 @@
-package com.fatapp.oxygentoolbox.util;
+package com.fatapp.oxygentoolbox.util.json;
 
+import com.fatapp.oxygentoolbox.util.Locales;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;