diff --git a/app/src/main/java/net/xcreen/restsms/AppContext.java b/app/src/main/java/net/xcreen/restsms/AppContext.java
index d56ac87..fd5342f 100644
--- a/app/src/main/java/net/xcreen/restsms/AppContext.java
+++ b/app/src/main/java/net/xcreen/restsms/AppContext.java
@@ -4,6 +4,6 @@ import android.app.Application;
 
 public class AppContext extends Application {
 
-    SMSServer smsServer = new SMSServer();
+    public SMSServer smsServer = new SMSServer();
 
 }
diff --git a/app/src/main/java/net/xcreen/restsms/MainActivity.java b/app/src/main/java/net/xcreen/restsms/MainActivity.java
index 4d98715..8bdfa3f 100644
--- a/app/src/main/java/net/xcreen/restsms/MainActivity.java
+++ b/app/src/main/java/net/xcreen/restsms/MainActivity.java
@@ -12,6 +12,10 @@ import androidx.fragment.app.FragmentTransaction;
 
 import android.view.MenuItem;
 
+import net.xcreen.restsms.fragments.AboutFragment;
+import net.xcreen.restsms.fragments.HomeFragment;
+import net.xcreen.restsms.fragments.SettingsFragment;
+
 import org.slf4j.impl.SimpleLogger;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
diff --git a/app/src/main/java/net/xcreen/restsms/AboutAppFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/AboutAppFragment.java
similarity index 97%
rename from app/src/main/java/net/xcreen/restsms/AboutAppFragment.java
rename to app/src/main/java/net/xcreen/restsms/fragments/AboutAppFragment.java
index 3ecb386..6f316a5 100644
--- a/app/src/main/java/net/xcreen/restsms/AboutAppFragment.java
+++ b/app/src/main/java/net/xcreen/restsms/fragments/AboutAppFragment.java
@@ -1,4 +1,4 @@
-package net.xcreen.restsms;
+package net.xcreen.restsms.fragments;
 
 import android.Manifest;
 import android.content.Context;
@@ -16,6 +16,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import net.xcreen.restsms.BuildConfig;
+import net.xcreen.restsms.R;
+
 public class AboutAppFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/java/net/xcreen/restsms/AboutFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/AboutFragment.java
similarity index 98%
rename from app/src/main/java/net/xcreen/restsms/AboutFragment.java
rename to app/src/main/java/net/xcreen/restsms/fragments/AboutFragment.java
index 7b37212..528f0c5 100644
--- a/app/src/main/java/net/xcreen/restsms/AboutFragment.java
+++ b/app/src/main/java/net/xcreen/restsms/fragments/AboutFragment.java
@@ -1,4 +1,4 @@
-package net.xcreen.restsms;
+package net.xcreen.restsms.fragments;
 
 import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.fragment.app.Fragment;
@@ -14,6 +14,8 @@ import android.view.ViewGroup;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.tabs.TabLayout;
 
+import net.xcreen.restsms.R;
+
 public class AboutFragment extends Fragment {
 
     private TabLayout tabLayout;
diff --git a/app/src/main/java/net/xcreen/restsms/AboutMeFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/AboutMeFragment.java
similarity index 96%
rename from app/src/main/java/net/xcreen/restsms/AboutMeFragment.java
rename to app/src/main/java/net/xcreen/restsms/fragments/AboutMeFragment.java
index e8899fb..9f854e9 100644
--- a/app/src/main/java/net/xcreen/restsms/AboutMeFragment.java
+++ b/app/src/main/java/net/xcreen/restsms/fragments/AboutMeFragment.java
@@ -1,4 +1,4 @@
-package net.xcreen.restsms;
+package net.xcreen.restsms.fragments;
 
 import android.net.Uri;
 import android.os.Bundle;
@@ -11,6 +11,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import net.xcreen.restsms.R;
+
 
 public class AboutMeFragment extends Fragment {
 
diff --git a/app/src/main/java/net/xcreen/restsms/AboutThirdPartyLibrarysFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/AboutThirdPartyLibrarysFragment.java
similarity index 98%
rename from app/src/main/java/net/xcreen/restsms/AboutThirdPartyLibrarysFragment.java
rename to app/src/main/java/net/xcreen/restsms/fragments/AboutThirdPartyLibrarysFragment.java
index 5932a9e..bcaa20e 100644
--- a/app/src/main/java/net/xcreen/restsms/AboutThirdPartyLibrarysFragment.java
+++ b/app/src/main/java/net/xcreen/restsms/fragments/AboutThirdPartyLibrarysFragment.java
@@ -1,4 +1,4 @@
-package net.xcreen.restsms;
+package net.xcreen.restsms.fragments;
 
 import android.content.Context;
 import android.net.Uri;
@@ -15,6 +15,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import net.xcreen.restsms.R;
+
 import java.util.ArrayList;
 
 public class AboutThirdPartyLibrarysFragment extends Fragment {
diff --git a/app/src/main/java/net/xcreen/restsms/HomeFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java
similarity index 98%
rename from app/src/main/java/net/xcreen/restsms/HomeFragment.java
rename to app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java
index 9a43d47..b335984 100644
--- a/app/src/main/java/net/xcreen/restsms/HomeFragment.java
+++ b/app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java
@@ -1,4 +1,4 @@
-package net.xcreen.restsms;
+package net.xcreen.restsms.fragments;
 
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
@@ -19,6 +19,9 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.Toast;
 
+import net.xcreen.restsms.AppContext;
+import net.xcreen.restsms.R;
+
 import java.net.BindException;
 
 public class HomeFragment extends Fragment {
diff --git a/app/src/main/java/net/xcreen/restsms/SettingsFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.java
similarity index 97%
rename from app/src/main/java/net/xcreen/restsms/SettingsFragment.java
rename to app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.java
index 6bbf691..5bc315d 100644
--- a/app/src/main/java/net/xcreen/restsms/SettingsFragment.java
+++ b/app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.java
@@ -1,4 +1,4 @@
-package net.xcreen.restsms;
+package net.xcreen.restsms.fragments;
 
 import androidx.fragment.app.Fragment;
 
@@ -13,6 +13,8 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import net.xcreen.restsms.R;
+
 public class SettingsFragment extends Fragment {
 
     @Override
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 6b781b7..c059a27 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".AboutFragment">
+    tools:context=".fragments.AboutFragment">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/about_view_pager"
diff --git a/app/src/main/res/layout/fragment_about_app.xml b/app/src/main/res/layout/fragment_about_app.xml
index 8bf8291..3253d1c 100644
--- a/app/src/main/res/layout/fragment_about_app.xml
+++ b/app/src/main/res/layout/fragment_about_app.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".AboutAppFragment">
+    tools:context=".fragments.AboutAppFragment">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_about_me.xml b/app/src/main/res/layout/fragment_about_me.xml
index 5e501b3..f931a52 100644
--- a/app/src/main/res/layout/fragment_about_me.xml
+++ b/app/src/main/res/layout/fragment_about_me.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="@dimen/fragment_padding"
-    tools:context=".AboutMeFragment">
+    tools:context=".fragments.AboutMeFragment">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_about_third_party_librarys.xml b/app/src/main/res/layout/fragment_about_third_party_librarys.xml
index 8b290bc..5d5d1cd 100644
--- a/app/src/main/res/layout/fragment_about_third_party_librarys.xml
+++ b/app/src/main/res/layout/fragment_about_third_party_librarys.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".AboutThirdPartyLibrarysFragment">
+    tools:context=".fragments.AboutThirdPartyLibrarysFragment">
 
     <ListView
         android:id="@+id/about_third_party_list_view"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 3ea77b5..3c32d40 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/fragment_padding"
-    tools:context=".HomeFragment">
+    tools:context=".fragments.HomeFragment">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index bfa1689..6c5c655 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/fragment_padding"
-    tools:context=".SettingsFragment">
+    tools:context=".fragments.SettingsFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"