diff --git a/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java
index 1b7de10e4eca3ff2cd597a83973278aced136d2a..676e6c82cbe010934ac3ba34f8acf014677a67e8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java
@@ -35,7 +35,7 @@ import java.util.Observable;
 import java.util.Observer;
 
 import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.base.drawer.NavigationDrawerFragment;
+import se.leap.bitmaskclient.base.fragments.NavigationDrawerFragment;
 import se.leap.bitmaskclient.eip.EIP;
 import se.leap.bitmaskclient.eip.EipCommand;
 import se.leap.bitmaskclient.eip.EipSetupListener;
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
similarity index 98%
rename from app/src/main/java/se/leap/bitmaskclient/base/drawer/NavigationDrawerFragment.java
rename to app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
index e70c87f95de0caa4889912d3fe02669e08e4dca7..2ce0e597f03e50753faa9eb160c00b6bc07a1a60 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package se.leap.bitmaskclient.base.drawer;
+package se.leap.bitmaskclient.base.fragments;
 
 
 import android.app.Activity;
@@ -50,7 +50,6 @@ import java.util.Observer;
 import java.util.Set;
 
 import de.blinkt.openvpn.core.VpnStatus;
-import se.leap.bitmaskclient.base.fragments.EipFragment;
 import se.leap.bitmaskclient.base.FragmentManagerEnhanced;
 import se.leap.bitmaskclient.base.MainActivity;
 import se.leap.bitmaskclient.base.models.Provider;
@@ -60,11 +59,6 @@ import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.eip.EipCommand;
 import se.leap.bitmaskclient.eip.EipStatus;
 import se.leap.bitmaskclient.firewall.FirewallManager;
-import se.leap.bitmaskclient.base.fragments.AboutFragment;
-import se.leap.bitmaskclient.base.fragments.AlwaysOnDialog;
-import se.leap.bitmaskclient.base.fragments.ExcludeAppsFragment;
-import se.leap.bitmaskclient.base.fragments.LogFragment;
-import se.leap.bitmaskclient.base.fragments.TetheringDialog;
 import se.leap.bitmaskclient.tethering.TetheringObservable;
 import se.leap.bitmaskclient.base.utils.PreferenceHelper;
 import se.leap.bitmaskclient.base.views.IconSwitchEntry;
diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml
index 4e921a9cf79a6a870c7bbde888962cd6649a7d8d..0e30d2a821d3b4464c0ad73cfe0a63d32c402491 100644
--- a/app/src/main/res/layout/a_main.xml
+++ b/app/src/main/res/layout/a_main.xml
@@ -34,7 +34,7 @@
          the container. -->
     <fragment
         android:id="@+id/navigation_drawer"
-        android:name="se.leap.bitmaskclient.base.drawer.NavigationDrawerFragment"
+        android:name="se.leap.bitmaskclient.base.fragments.NavigationDrawerFragment"
         android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index be60e6204381737b1bf64c7d209e0212b20d87f5..d2729998dbc93c79336f0efe56b7a7d7a07e679a 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:background="@color/colorBackground"
-    tools:context=".base.drawer.NavigationDrawerFragment"
+    tools:context=".base.fragments.NavigationDrawerFragment"
     android:clickable="true"
     android:focusable="true"
     android:fillViewport="true"