diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java
index 12a87758a..01603d761 100644
--- a/app/src/main/java/org/isoron/uhabits/MainActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java
@@ -25,7 +25,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import org.isoron.helpers.ReplayableActivity;
-import org.isoron.uhabits.dialogs.ListHabitsFragment;
+import org.isoron.uhabits.fragments.ListHabitsFragment;
 import org.isoron.uhabits.models.Habit;
 
 public class MainActivity extends ReplayableActivity
diff --git a/app/src/main/java/org/isoron/uhabits/SettingsActivity.java b/app/src/main/java/org/isoron/uhabits/SettingsActivity.java
index c996ab09e..a39e8ffaa 100644
--- a/app/src/main/java/org/isoron/uhabits/SettingsActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/SettingsActivity.java
@@ -19,7 +19,7 @@ package org.isoron.uhabits;
 import android.app.Activity;
 import android.os.Bundle;
 
-import org.isoron.uhabits.dialogs.SettingsFragment;
+import org.isoron.uhabits.fragments.SettingsFragment;
 
 public class SettingsActivity extends Activity
 {
diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java
rename to app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java
index 6d5706244..1a84d3368 100644
--- a/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java
@@ -14,7 +14,7 @@
  * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.dialogs;
+package org.isoron.uhabits.fragments;
 
 import android.app.DialogFragment;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
rename to app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
index 6bb4b3013..4409cc851 100644
--- a/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
@@ -14,7 +14,7 @@
  * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.dialogs;
+package org.isoron.uhabits.fragments;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/SettingsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/dialogs/SettingsFragment.java
rename to app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java
index 224897a6c..66de86d12 100644
--- a/app/src/main/java/org/isoron/uhabits/dialogs/SettingsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java
@@ -14,7 +14,7 @@
  * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.dialogs;
+package org.isoron.uhabits.fragments;
 
 import android.app.backup.BackupManager;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
similarity index 99%
rename from app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java
rename to app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
index b44b4d322..57251f85d 100644
--- a/app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
@@ -14,7 +14,7 @@
  * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.dialogs;
+package org.isoron.uhabits.fragments;
 
 import android.app.Fragment;
 import android.graphics.Color;
diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index 011638bba..d3b3a9460 100644
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
-    tools:context="org.isoron.uhabits.dialogs.EditHabitFragment"
+    tools:context="org.isoron.uhabits.fragments.EditHabitFragment"
     tools:ignore="MergeRootFrame"
     style="@style/dialogForm">
 
diff --git a/app/src/main/res/layout/list_habits_activity.xml b/app/src/main/res/layout/list_habits_activity.xml
index 58a780010..0669fb045 100644
--- a/app/src/main/res/layout/list_habits_activity.xml
+++ b/app/src/main/res/layout/list_habits_activity.xml
@@ -8,7 +8,7 @@
 
     <fragment
         android:id="@+id/fragment1"
-        android:name="org.isoron.uhabits.dialogs.ListHabitsFragment"
+        android:name="org.isoron.uhabits.fragments.ListHabitsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/list_habits_fragment" />
diff --git a/app/src/main/res/layout/show_habit_activity.xml b/app/src/main/res/layout/show_habit_activity.xml
index 938d4d9f4..281221efc 100644
--- a/app/src/main/res/layout/show_habit_activity.xml
+++ b/app/src/main/res/layout/show_habit_activity.xml
@@ -8,7 +8,7 @@
 
     <fragment
         android:id="@+id/fragment2"
-        android:name="org.isoron.uhabits.dialogs.ShowHabitFragment"
+        android:name="org.isoron.uhabits.fragments.ShowHabitFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />