diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f226625..e5efabc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -111,7 +111,7 @@
             android:label="@string/title_activity_general_settings" >
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name="fr.unix_experience.owncloud_sms.activities.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 1bcf7d2..2a43cf4 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -30,4 +30,4 @@
     android:id="@+id/pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="fr.unix_experience.owncloud_sms.MainActivity" />
+    tools:context="fr.unix_experience.owncloud_sms.activities.MainActivity" />
diff --git a/src/fr/unix_experience/owncloud_sms/MainActivity.java b/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
similarity index 96%
rename from src/fr/unix_experience/owncloud_sms/MainActivity.java
rename to src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
index 55bd2a1..55973f1 100644
--- a/src/fr/unix_experience/owncloud_sms/MainActivity.java
+++ b/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package fr.unix_experience.owncloud_sms;
+package fr.unix_experience.owncloud_sms.activities;
 
 /*
  * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
@@ -28,7 +28,10 @@ package fr.unix_experience.owncloud_sms;
 import java.util.List;
 import java.util.Vector;
 
-import fr.unix_experience.owncloud_sms.activities.GeneralSettingsActivity;
+import fr.unix_experience.owncloud_sms.R;
+import fr.unix_experience.owncloud_sms.R.id;
+import fr.unix_experience.owncloud_sms.R.layout;
+import fr.unix_experience.owncloud_sms.R.menu;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;