diff --git a/app/src/main/java/org/isoron/uhabits/IntroActivity.java b/app/src/main/java/org/isoron/uhabits/IntroActivity.java
index 1e17d85ca..e802e2248 100644
--- a/app/src/main/java/org/isoron/uhabits/IntroActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/IntroActivity.java
@@ -29,27 +29,26 @@ public class IntroActivity extends AppIntro2
     {
         showStatusBar(false);
 
-        addSlide(AppIntroFragment.newInstance("Welcome",
-                "Loop helps you create and maintain good habits.", R.drawable.tutorial_1,
+        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_1),
+                getString(R.string.intro_description_1), R.drawable.intro_icon_1,
                 Color.parseColor("#194673")));
 
-        addSlide(AppIntroFragment.newInstance("Create some new habits",
-                "Every day, after performing your habit, put a checkmark on the app.",
-                R.drawable.tutorial_2, Color.parseColor("#ffa726")));
+        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_2),
+                getString(R.string.intro_description_2), R.drawable.intro_icon_2,
+                Color.parseColor("#ffa726")));
 
-        addSlide(AppIntroFragment.newInstance("Keep doing it",
-                "Habits performed consistently for a long time will earn a full star.",
-                R.drawable.tutorial_3, Color.parseColor("#7cb342")));
+        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_3),
+                getString(R.string.intro_description_3), R.drawable.intro_icon_3,
+                Color.parseColor("#7cb342")));
 
-        addSlide(AppIntroFragment.newInstance("Track your progress",
-                "Detailed graphs show you how your habits improved over time.",
-                R.drawable.tutorial_4, Color.parseColor("#9575cd")));
+        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_4),
+                getString(R.string.intro_description_4), R.drawable.intro_icon_4,
+                Color.parseColor("#9575cd")));
     }
 
     @Override
     public void onNextPressed()
     {
-
     }
 
     @Override
@@ -61,6 +60,5 @@ public class IntroActivity extends AppIntro2
     @Override
     public void onSlideChanged()
     {
-
     }
 }
diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java
index 01603d761..4159e2c86 100644
--- a/app/src/main/java/org/isoron/uhabits/MainActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java
@@ -26,6 +26,7 @@ import android.view.MenuItem;
 
 import org.isoron.helpers.ReplayableActivity;
 import org.isoron.uhabits.fragments.ListHabitsFragment;
+import org.isoron.uhabits.helpers.ReminderHelper;
 import org.isoron.uhabits.models.Habit;
 
 public class MainActivity extends ReplayableActivity
diff --git a/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java b/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java
index a018a266e..72ed45004 100644
--- a/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java
+++ b/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java
@@ -32,6 +32,7 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
+import org.isoron.uhabits.helpers.ReminderHelper;
 import org.isoron.uhabits.models.Habit;
 
 import java.util.Date;
diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
index 4409cc851..c50652b48 100644
--- a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
@@ -55,7 +55,7 @@ import org.isoron.helpers.DialogHelper;
 import org.isoron.helpers.DialogHelper.OnSavedListener;
 import org.isoron.helpers.ReplayableActivity;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ReminderHelper;
+import org.isoron.uhabits.helpers.ReminderHelper;
 import org.isoron.uhabits.loaders.HabitListLoader;
 import org.isoron.uhabits.models.Habit;
 
diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
index 57251f85d..75ff6b0ff 100644
--- a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
@@ -32,7 +32,7 @@ import org.isoron.helpers.ColorHelper;
 import org.isoron.helpers.Command;
 import org.isoron.helpers.DialogHelper;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ReminderHelper;
+import org.isoron.uhabits.helpers.ReminderHelper;
 import org.isoron.uhabits.ShowHabitActivity;
 import org.isoron.uhabits.models.Habit;
 import org.isoron.uhabits.views.HabitHistoryView;
diff --git a/app/src/main/java/org/isoron/uhabits/ReminderHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/ReminderHelper.java
rename to app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java
index 80cfb68e7..10731ccf7 100644
--- a/app/src/main/java/org/isoron/uhabits/ReminderHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java
@@ -14,7 +14,7 @@
  * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits;
+package org.isoron.uhabits.helpers;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -24,6 +24,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
+import org.isoron.uhabits.ReminderAlarmReceiver;
 import org.isoron.uhabits.models.Habit;
 
 import java.text.DateFormat;
diff --git a/app/src/main/res/drawable/tutorial_1.png b/app/src/main/res/drawable/intro_icon_1.png
similarity index 100%
rename from app/src/main/res/drawable/tutorial_1.png
rename to app/src/main/res/drawable/intro_icon_1.png
diff --git a/app/src/main/res/drawable/tutorial_2.png b/app/src/main/res/drawable/intro_icon_2.png
similarity index 100%
rename from app/src/main/res/drawable/tutorial_2.png
rename to app/src/main/res/drawable/intro_icon_2.png
diff --git a/app/src/main/res/drawable/tutorial_3.png b/app/src/main/res/drawable/intro_icon_3.png
similarity index 100%
rename from app/src/main/res/drawable/tutorial_3.png
rename to app/src/main/res/drawable/intro_icon_3.png
diff --git a/app/src/main/res/drawable/tutorial_4.png b/app/src/main/res/drawable/intro_icon_4.png
similarity index 100%
rename from app/src/main/res/drawable/tutorial_4.png
rename to app/src/main/res/drawable/intro_icon_4.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8f2d7e74b..6f3d09261 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,4 +68,16 @@
     <string name="validation_number_should_be_positive">Number must be positive.</string>
     <string name="validation_at_most_one_rep_per_day">You can have at most one repetition per day</string>
 
+    <!-- App introduction -->
+    <string name="intro_title_1">Welcome</string>
+    <string name="intro_description_1">Loop helps you create and maintain good habits.</string>
+
+    <string name="intro_title_2">Create some new habits</string>
+    <string name="intro_description_2">Every day, after performing your habit, put a checkmark on the app.</string>
+
+    <string name="intro_title_3">Keep doing it</string>
+    <string name="intro_description_3">Habits performed consistently for a long time will earn a full star.</string>
+
+    <string name="intro_title_4">Track your progress</string>
+    <string name="intro_description_4">Detailed graphs show you how your habits improved over time.</string>
 </resources>
\ No newline at end of file