diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/installation/InstallationPreference.kt
similarity index 98%
rename from app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
rename to app/src/main/java/com/aurora/store/view/ui/preferences/installation/InstallationPreference.kt
index 8c11576b7..1c33ffc02 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/installation/InstallationPreference.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.view.ui.preferences
+package com.aurora.store.view.ui.preferences.installation
 
 import android.app.admin.DevicePolicyManager
 import android.content.DialogInterface
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/installation/InstallerFragment.kt
similarity index 99%
rename from app/src/main/java/com/aurora/store/view/ui/preferences/InstallerFragment.kt
rename to app/src/main/java/com/aurora/store/view/ui/preferences/installation/InstallerFragment.kt
index 090afbb28..db14bf7e3 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/installation/InstallerFragment.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.view.ui.preferences
+package com.aurora.store.view.ui.preferences.installation
 
 import android.content.pm.PackageManager
 import android.os.Bundle
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/network/NetworkPreference.kt
similarity index 96%
rename from app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
rename to app/src/main/java/com/aurora/store/view/ui/preferences/network/NetworkPreference.kt
index 826df0385..b93d5b5a2 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/network/NetworkPreference.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.view.ui.preferences
+package com.aurora.store.view.ui.preferences.network
 
 import android.os.Bundle
 import android.view.View
@@ -34,6 +34,7 @@ import com.aurora.store.util.Preferences.PREFERENCE_MICROG_AUTH
 import com.aurora.store.util.Preferences.PREFERENCE_PROXY_URL
 import com.aurora.store.util.Preferences.PREFERENCE_VENDING_VERSION
 import com.aurora.store.util.save
+import com.aurora.store.view.ui.preferences.BasePreferenceFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/ProxyURLDialog.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/network/ProxyURLDialog.kt
similarity index 98%
rename from app/src/main/java/com/aurora/store/view/ui/preferences/ProxyURLDialog.kt
rename to app/src/main/java/com/aurora/store/view/ui/preferences/network/ProxyURLDialog.kt
index a2539ed65..c6d8c5085 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/ProxyURLDialog.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/network/ProxyURLDialog.kt
@@ -1,4 +1,4 @@
-package com.aurora.store.view.ui.preferences
+package com.aurora.store.view.ui.preferences.network
 
 import android.app.Dialog
 import android.os.Bundle
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index fa1d50012..cc9b5c3a3 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -98,12 +98,12 @@
     </fragment>
     <fragment
         android:id="@+id/installationPreference"
-        android:name="com.aurora.store.view.ui.preferences.InstallationPreference"
+        android:name="com.aurora.store.view.ui.preferences.installation.InstallationPreference"
         android:label="InstallationPreference"
         tools:layout="@layout/fragment_setting" />
     <fragment
         android:id="@+id/networkPreference"
-        android:name="com.aurora.store.view.ui.preferences.NetworkPreference"
+        android:name="com.aurora.store.view.ui.preferences.network.NetworkPreference"
         android:label="NetworkPreference"
         tools:layout="@layout/fragment_setting" />
     <fragment
@@ -350,7 +350,7 @@
     </fragment>
     <fragment
         android:id="@+id/installerFragment"
-        android:name="com.aurora.store.view.ui.preferences.InstallerFragment"
+        android:name="com.aurora.store.view.ui.preferences.installation.InstallerFragment"
         android:label="InstallerFragment"
         tools:layout="@layout/fragment_installer" />
     <fragment