diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index baee8082..be3f7d72 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,8 +52,8 @@
             android:launchMode="singleTop"
             android:exported="true" />
         <activity
-            android:name=".activities.EditCtrlPermissions"
-            android:parentActivityName=".activities.SettingsActivity" />
+            android:name=".activities.prefs.EditCtrlPermissions"
+            android:parentActivityName=".activities.prefs.SettingsActivity" />
 
         <activity
             android:name=".activities.OnBoardingActivity" />
@@ -74,17 +74,17 @@
             android:launchMode="singleTop"
             android:parentActivityName=".activities.MainActivity"/>
         <activity
-            android:name=".activities.SettingsActivity"
+            android:name=".activities.prefs.SettingsActivity"
             android:launchMode="singleTop"
             android:parentActivityName=".activities.MainActivity" />
         <activity
-            android:name=".activities.VpnExemptionsActivity"
+            android:name=".activities.prefs.VpnExemptionsActivity"
             android:launchMode="singleTop"
-            android:parentActivityName=".activities.SettingsActivity" />
+            android:parentActivityName=".activities.prefs.SettingsActivity" />
         <activity
-            android:name=".activities.PortMapActivity"
+            android:name=".activities.prefs.PortMapActivity"
             android:launchMode="singleTop"
-            android:parentActivityName=".activities.SettingsActivity" />
+            android:parentActivityName=".activities.prefs.SettingsActivity" />
         <activity
             android:name=".activities.AboutActivity"
             android:launchMode="singleTop"
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/BaseActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/BaseActivity.java
index 49c8bc18..baf67504 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/BaseActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/BaseActivity.java
@@ -11,7 +11,7 @@ import com.emanuelef.remote_capture.Utils;
 
 import java.util.List;
 
-class BaseActivity extends AppCompatActivity {
+public class BaseActivity extends AppCompatActivity {
     private boolean mBackAction = false;
 
     @Override
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
index db13a6a2..31b3077a 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
@@ -61,6 +61,7 @@ import com.emanuelef.remote_capture.BuildConfig;
 import com.emanuelef.remote_capture.CaptureHelper;
 import com.emanuelef.remote_capture.Log;
 import com.emanuelef.remote_capture.MitmReceiver;
+import com.emanuelef.remote_capture.activities.prefs.SettingsActivity;
 import com.emanuelef.remote_capture.fragments.ConnectionsFragment;
 import com.emanuelef.remote_capture.fragments.StatusFragment;
 import com.emanuelef.remote_capture.interfaces.AppStateListener;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/EditCtrlPermissions.java b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/EditCtrlPermissions.java
similarity index 97%
rename from app/src/main/java/com/emanuelef/remote_capture/activities/EditCtrlPermissions.java
rename to app/src/main/java/com/emanuelef/remote_capture/activities/prefs/EditCtrlPermissions.java
index cd6e8cee..3757d820 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/EditCtrlPermissions.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/EditCtrlPermissions.java
@@ -17,7 +17,7 @@
  * Copyright 2020-21 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.activities;
+package com.emanuelef.remote_capture.activities.prefs;
 import android.os.Bundle;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -30,6 +30,7 @@ import android.widget.TextView;
 
 import com.emanuelef.remote_capture.PCAPdroid;
 import com.emanuelef.remote_capture.R;
+import com.emanuelef.remote_capture.activities.BaseActivity;
 import com.emanuelef.remote_capture.adapters.CtrlPermissionsAdapter;
 import com.emanuelef.remote_capture.model.CtrlPermissions;
 
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/PortMapActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/PortMapActivity.java
similarity index 86%
rename from app/src/main/java/com/emanuelef/remote_capture/activities/PortMapActivity.java
rename to app/src/main/java/com/emanuelef/remote_capture/activities/prefs/PortMapActivity.java
index 9571faea..d38f781f 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/PortMapActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/PortMapActivity.java
@@ -17,12 +17,13 @@
  * Copyright 2020-22 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.activities;
+package com.emanuelef.remote_capture.activities.prefs;
 
 import android.os.Bundle;
 
 import com.emanuelef.remote_capture.R;
-import com.emanuelef.remote_capture.fragments.PortMapFragment;
+import com.emanuelef.remote_capture.activities.BaseActivity;
+import com.emanuelef.remote_capture.fragments.prefs.PortMapFragment;
 
 public class PortMapActivity extends BaseActivity {
     @Override
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/SettingsActivity.java
similarity index 98%
rename from app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
rename to app/src/main/java/com/emanuelef/remote_capture/activities/prefs/SettingsActivity.java
index a2a1e3a5..af82d697 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/SettingsActivity.java
@@ -17,7 +17,7 @@
  * Copyright 2020-21 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.activities;
+package com.emanuelef.remote_capture.activities.prefs;
 
 import android.content.Context;
 import android.content.Intent;
@@ -44,8 +44,11 @@ import com.emanuelef.remote_capture.Log;
 import com.emanuelef.remote_capture.PCAPdroid;
 import com.emanuelef.remote_capture.Utils;
 import com.emanuelef.remote_capture.MitmAddon;
-import com.emanuelef.remote_capture.fragments.DnsSettings;
-import com.emanuelef.remote_capture.fragments.GeoipSettings;
+import com.emanuelef.remote_capture.activities.BaseActivity;
+import com.emanuelef.remote_capture.activities.MainActivity;
+import com.emanuelef.remote_capture.activities.MitmSetupWizard;
+import com.emanuelef.remote_capture.fragments.prefs.DnsSettings;
+import com.emanuelef.remote_capture.fragments.prefs.GeoipSettings;
 import com.emanuelef.remote_capture.model.Prefs;
 import com.emanuelef.remote_capture.R;
 
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/VpnExemptionsActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/VpnExemptionsActivity.java
similarity index 97%
rename from app/src/main/java/com/emanuelef/remote_capture/activities/VpnExemptionsActivity.java
rename to app/src/main/java/com/emanuelef/remote_capture/activities/prefs/VpnExemptionsActivity.java
index b28f63c6..92fff094 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/VpnExemptionsActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/prefs/VpnExemptionsActivity.java
@@ -17,7 +17,7 @@
  * Copyright 2020-22 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.activities;
+package com.emanuelef.remote_capture.activities.prefs;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -30,6 +30,7 @@ import androidx.preference.PreferenceManager;
 
 import com.emanuelef.remote_capture.Log;
 import com.emanuelef.remote_capture.R;
+import com.emanuelef.remote_capture.activities.BaseActivity;
 import com.emanuelef.remote_capture.fragments.AppsToggles;
 import com.emanuelef.remote_capture.model.AppDescriptor;
 import com.emanuelef.remote_capture.model.Prefs;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/DnsSettings.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/DnsSettings.java
similarity index 96%
rename from app/src/main/java/com/emanuelef/remote_capture/fragments/DnsSettings.java
rename to app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/DnsSettings.java
index 8021e4c1..f2e2014c 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/DnsSettings.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/DnsSettings.java
@@ -17,7 +17,7 @@
  * Copyright 2020-22 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.fragments;
+package com.emanuelef.remote_capture.fragments.prefs;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/GeoipSettings.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/GeoipSettings.java
similarity index 98%
rename from app/src/main/java/com/emanuelef/remote_capture/fragments/GeoipSettings.java
rename to app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/GeoipSettings.java
index 1442dd38..488336cc 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/GeoipSettings.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/GeoipSettings.java
@@ -17,7 +17,7 @@
  * Copyright 2020-22 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.fragments;
+package com.emanuelef.remote_capture.fragments.prefs;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/PortMapFragment.java
similarity index 99%
rename from app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java
rename to app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/PortMapFragment.java
index 691a4ff7..5fdcae5f 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/PortMapFragment.java
@@ -17,7 +17,7 @@
  * Copyright 2020-22 - Emanuele Faranda
  */
 
-package com.emanuelef.remote_capture.fragments;
+package com.emanuelef.remote_capture.fragments.prefs;
 
 import android.content.Context;
 import android.content.SharedPreferences;