diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 465afef..d9fe9db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NextLocation">
-        <activity android:name=".MainActivity">
+        <activity android:name=".fragments.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/a1/nextlocation/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/CouponFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
index b215276..22302bb 100644
--- a/app/src/main/java/com/a1/nextlocation/CouponFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class CouponFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/HomeFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/HomeFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
index c61d6fe..7610b2a 100644
--- a/app/src/main/java/com/a1/nextlocation/HomeFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class HomeFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/LocationDetailFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/LocationDetailFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
index 9647aeb..ea2fae9 100644
--- a/app/src/main/java/com/a1/nextlocation/LocationDetailFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class LocationDetailFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/LocationFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/LocationFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
index 6f7f836..133665f 100644
--- a/app/src/main/java/com/a1/nextlocation/LocationFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class LocationFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/fragments/MainActivity.java
similarity index 86%
rename from app/src/main/java/com/a1/nextlocation/MainActivity.java
rename to app/src/main/java/com/a1/nextlocation/fragments/MainActivity.java
index 8e1cba5..434c91c 100644
--- a/app/src/main/java/com/a1/nextlocation/MainActivity.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/MainActivity.java
@@ -1,9 +1,11 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 
+import com.a1.nextlocation.R;
+
 public class MainActivity extends AppCompatActivity {
 
     /**
diff --git a/app/src/main/java/com/a1/nextlocation/RouteDetailFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/RouteDetailFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
index 6929de9..c610d6a 100644
--- a/app/src/main/java/com/a1/nextlocation/RouteDetailFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class RouteDetailFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/RouteFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/RouteFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java
index f86a3f8..59043de 100644
--- a/app/src/main/java/com/a1/nextlocation/RouteFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class RouteFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/SettingsFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index d1246b2..92fa105 100644
--- a/app/src/main/java/com/a1/nextlocation/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class SettingsFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
similarity index 89%
rename from app/src/main/java/com/a1/nextlocation/StatisticFragment.java
rename to app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
index b443d15..d86d6ea 100644
--- a/app/src/main/java/com/a1/nextlocation/StatisticFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
@@ -1,4 +1,4 @@
-package com.a1.nextlocation;
+package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.a1.nextlocation.R;
+
 public class StatisticFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4fc2444..0496e03 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".fragments.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_coupon.xml b/app/src/main/res/layout/fragment_coupon.xml
index 506e204..2c97a46 100644
--- a/app/src/main/res/layout/fragment_coupon.xml
+++ b/app/src/main/res/layout/fragment_coupon.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CouponFragment">
+    tools:context=".fragments.CouponFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 27a4d2c..5194fda 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".HomeFragment">
+    tools:context=".fragments.HomeFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml
index 787d27b..958a325 100644
--- a/app/src/main/res/layout/fragment_location.xml
+++ b/app/src/main/res/layout/fragment_location.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".LocationFragment">
+    tools:context=".fragments.LocationFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_location_detail.xml b/app/src/main/res/layout/fragment_location_detail.xml
index 4a42c2d..92351b4 100644
--- a/app/src/main/res/layout/fragment_location_detail.xml
+++ b/app/src/main/res/layout/fragment_location_detail.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".LocationDetailFragment">
+    tools:context=".fragments.LocationDetailFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml
index 3fe4c13..e5caeb4 100644
--- a/app/src/main/res/layout/fragment_route.xml
+++ b/app/src/main/res/layout/fragment_route.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".RouteFragment">
+    tools:context=".fragments.RouteFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail.xml
index f1ee0d0..53b95a9 100644
--- a/app/src/main/res/layout/fragment_route_detail.xml
+++ b/app/src/main/res/layout/fragment_route_detail.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".RouteDetailFragment">
+    tools:context=".fragments.RouteDetailFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 647f96b..453d34f 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingsFragment">
+    tools:context=".fragments.SettingsFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_statistic.xml b/app/src/main/res/layout/fragment_statistic.xml
index 76f4b5f..5373514 100644
--- a/app/src/main/res/layout/fragment_statistic.xml
+++ b/app/src/main/res/layout/fragment_statistic.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".StatisticFragment">
+    tools:context=".fragments.StatisticFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView