diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/GameActivity.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/GameActivity.java
index ddf622cf..d499b0a8 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/GameActivity.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/GameActivity.java
@@ -12,7 +12,7 @@
 import fr.tvbarthel.games.chasewhisply.model.GameInformationFactory;
 import fr.tvbarthel.games.chasewhisply.model.GameMode;
 import fr.tvbarthel.games.chasewhisply.model.GameModeFactory;
-import fr.tvbarthel.games.chasewhisply.ui.GameScoreFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.GameScoreFragment;
 import fr.tvbarthel.games.chasewhisply.ui.GameView;
 
 public class GameActivity extends ARActivity implements GameEngine.IGameEngine,
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/HomeActivity.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/HomeActivity.java
index da378bf5..cf18ab53 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/HomeActivity.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/HomeActivity.java
@@ -19,12 +19,12 @@
 import fr.tvbarthel.games.chasewhisply.model.GameInformation;
 import fr.tvbarthel.games.chasewhisply.model.GameMode;
 import fr.tvbarthel.games.chasewhisply.model.Weapon;
-import fr.tvbarthel.games.chasewhisply.ui.AboutFragment;
-import fr.tvbarthel.games.chasewhisply.ui.GameHomeFragment;
-import fr.tvbarthel.games.chasewhisply.ui.GameModeChooserFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.AboutFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.GameHomeFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.GameModeChooserFragment;
 import fr.tvbarthel.games.chasewhisply.ui.GameModeView;
-import fr.tvbarthel.games.chasewhisply.ui.GameScoreFragment;
-import fr.tvbarthel.games.chasewhisply.ui.LeaderboardChooserFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.GameScoreFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.LeaderboardChooserFragment;
 
 public class HomeActivity extends BaseGameActivity implements GameHomeFragment.Listener, GameScoreFragment.Listener, GameModeChooserFragment.Listener, LeaderboardChooserFragment.Listener {
 	//Request code
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/TutoActivity.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/TutoActivity.java
index e93d48b1..45346f27 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/TutoActivity.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/TutoActivity.java
@@ -20,7 +20,7 @@
 import android.widget.TextView;
 import android.widget.ViewSwitcher;
 
-import fr.tvbarthel.games.chasewhisply.ui.TutoFragment;
+import fr.tvbarthel.games.chasewhisply.ui.fragments.TutoFragment;
 
 public class TutoActivity extends FragmentActivity implements ViewSwitcher.ViewFactory {
 	public static final String EXTRA_HELP_REQUESTED = "ExtraHelpRequested";
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/AboutFragment.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/AboutFragment.java
similarity index 89%
rename from ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/AboutFragment.java
rename to ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/AboutFragment.java
index 8765ff11..a4feb4a1 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/AboutFragment.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/AboutFragment.java
@@ -1,4 +1,4 @@
-package fr.tvbarthel.games.chasewhisply.ui;
+package fr.tvbarthel.games.chasewhisply.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameHomeFragment.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameHomeFragment.java
similarity index 98%
rename from ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameHomeFragment.java
rename to ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameHomeFragment.java
index 99b7ae79..f8d42b45 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameHomeFragment.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameHomeFragment.java
@@ -1,4 +1,4 @@
-package fr.tvbarthel.games.chasewhisply.ui;
+package fr.tvbarthel.games.chasewhisply.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameModeChooserFragment.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameModeChooserFragment.java
similarity index 95%
rename from ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameModeChooserFragment.java
rename to ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameModeChooserFragment.java
index bd894803..607507d7 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameModeChooserFragment.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameModeChooserFragment.java
@@ -1,4 +1,4 @@
-package fr.tvbarthel.games.chasewhisply.ui;
+package fr.tvbarthel.games.chasewhisply.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -9,6 +9,7 @@
 
 import fr.tvbarthel.games.chasewhisply.R;
 import fr.tvbarthel.games.chasewhisply.model.GameModeFactory;
+import fr.tvbarthel.games.chasewhisply.ui.GameModeView;
 
 
 public class GameModeChooserFragment extends Fragment implements View.OnClickListener {
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameScoreFragment.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameScoreFragment.java
similarity index 99%
rename from ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameScoreFragment.java
rename to ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameScoreFragment.java
index ad5f852f..e8c53657 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/GameScoreFragment.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/GameScoreFragment.java
@@ -1,4 +1,4 @@
-package fr.tvbarthel.games.chasewhisply.ui;
+package fr.tvbarthel.games.chasewhisply.ui.fragments;
 
 
 import android.app.Activity;
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/LeaderboardChooserFragment.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/LeaderboardChooserFragment.java
similarity index 96%
rename from ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/LeaderboardChooserFragment.java
rename to ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/LeaderboardChooserFragment.java
index 15dbeb66..ba57b0fa 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/LeaderboardChooserFragment.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/LeaderboardChooserFragment.java
@@ -1,4 +1,4 @@
-package fr.tvbarthel.games.chasewhisply.ui;
+package fr.tvbarthel.games.chasewhisply.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -9,6 +9,7 @@
 
 import fr.tvbarthel.games.chasewhisply.R;
 import fr.tvbarthel.games.chasewhisply.model.GameModeFactory;
+import fr.tvbarthel.games.chasewhisply.ui.GameModeView;
 
 public class LeaderboardChooserFragment extends Fragment implements View.OnClickListener {
 
diff --git a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/TutoFragment.java b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/TutoFragment.java
similarity index 88%
rename from ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/TutoFragment.java
rename to ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/TutoFragment.java
index 353c3636..8bbf702d 100644
--- a/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/TutoFragment.java
+++ b/ChaseWhisply/src/main/java/fr/tvbarthel/games/chasewhisply/ui/fragments/TutoFragment.java
@@ -1,13 +1,10 @@
-package fr.tvbarthel.games.chasewhisply.ui;
+package fr.tvbarthel.games.chasewhisply.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import fr.tvbarthel.games.chasewhisply.R;
 
 public class TutoFragment extends Fragment {
 	public static final String ARG_LAYOUT_ID = "Tuto_Layout_Id_ARG";