diff --git a/app/build.gradle b/app/build.gradle
index e788ee84..58bd3d48 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,6 +47,11 @@ android {
         }
     }
 
+    configurations {
+        all {
+            exclude module: "commons-logging"
+        }
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d8704cea..c5abad64 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".ui.splash.SplashActivity"
+            android:name=".ui.splashScreen.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.Splash">
             <intent-filter>
@@ -22,7 +22,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.activities.MainActivity"
+            android:name=".ui.mainScreen.MainActivity"
             android:screenOrientation="portrait" />
     </application>
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/EntriesFragment.kt
similarity index 99%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/EntriesFragment.kt
index 23fff787..4607a42d 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/EntriesFragment.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/InfoFragment.kt
similarity index 98%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/InfoFragment.kt
index 6f646dd2..b9f593f6 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/InfoFragment.kt
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.content.Intent
 import android.net.Uri
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/activities/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MainActivity.kt
similarity index 94%
rename from app/src/main/java/com/rtbishop/look4sat/ui/activities/MainActivity.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MainActivity.kt
index 74c37993..e65fbdaa 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.ui.activities
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt
similarity index 99%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt
index 1ff6e068..ba0c024c 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.graphics.Color
 import android.graphics.ColorMatrix
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PassesFragment.kt
similarity index 99%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PassesFragment.kt
index f63b0e0d..5fdb4980 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PassesFragment.kt
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PolarFragment.kt
similarity index 99%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PolarFragment.kt
index bb835c51..ef6a2eb2 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PolarFragment.kt
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.content.Context
 import android.hardware.Sensor
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt
similarity index 99%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt
index 82476430..74fa3831 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.Manifest
 import android.content.pm.PackageManager
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/SourcesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SourcesDialog.kt
similarity index 98%
rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/SourcesDialog.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SourcesDialog.kt
index f5169668..8157494d 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/SourcesDialog.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SourcesDialog.kt
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package com.rtbishop.look4sat.ui.fragments
+package com.rtbishop.look4sat.ui.mainScreen
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashPosFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashPosFragment.kt
deleted file mode 100644
index 1ed7a917..00000000
--- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashPosFragment.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.rtbishop.look4sat.ui.splash
-
-import androidx.fragment.app.Fragment
-import com.rtbishop.look4sat.R
-
-class SplashPosFragment : Fragment(R.layout.fragment_splash_pos)
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashTleFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashTleFragment.kt
deleted file mode 100644
index 78f3a35d..00000000
--- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashTleFragment.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.rtbishop.look4sat.ui.splash
-
-import androidx.fragment.app.Fragment
-import com.rtbishop.look4sat.R
-
-class SplashTleFragment: Fragment(R.layout.fragment_splash_tle)
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/PosFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/PosFragment.kt
new file mode 100644
index 00000000..ff5b0b1b
--- /dev/null
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/PosFragment.kt
@@ -0,0 +1,6 @@
+package com.rtbishop.look4sat.ui.splashScreen
+
+import androidx.fragment.app.Fragment
+import com.rtbishop.look4sat.R
+
+class PosFragment : Fragment(R.layout.fragment_splash_pos)
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/SplashActivity.kt
similarity index 90%
rename from app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/SplashActivity.kt
index ef03f6fc..9272593f 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/SplashActivity.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.ui.splash
+package com.rtbishop.look4sat.ui.splashScreen
 
 import android.content.Intent
 import android.os.Bundle
@@ -8,7 +8,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.databinding.ActivitySplashBinding
-import com.rtbishop.look4sat.ui.activities.MainActivity
+import com.rtbishop.look4sat.ui.mainScreen.MainActivity
 import com.rtbishop.look4sat.utility.PrefsManager
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -62,9 +62,9 @@ class SplashActivity : FragmentActivity() {
 
         override fun createFragment(position: Int): Fragment {
             return when (position) {
-                0 -> SplashTleFragment()
-                1 -> SplashPosFragment()
-                else -> SplashTleFragment()
+                0 -> TleFragment()
+                1 -> PosFragment()
+                else -> TleFragment()
             }
         }
     }
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/TleFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/TleFragment.kt
new file mode 100644
index 00000000..c9d356a0
--- /dev/null
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/splashScreen/TleFragment.kt
@@ -0,0 +1,6 @@
+package com.rtbishop.look4sat.ui.splashScreen
+
+import androidx.fragment.app.Fragment
+import com.rtbishop.look4sat.R
+
+class TleFragment: Fragment(R.layout.fragment_splash_tle)
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 041b9ad0..2aab13c9 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.splash.SplashActivity">
+    tools:context=".ui.splashScreen.SplashActivity">
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/splashPager"
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml
index faf01c75..5eb48ba2 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@@ -22,7 +22,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragments.InfoFragment">
+    tools:context=".ui.mainScreen.InfoFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_splash_pos.xml b/app/src/main/res/layout/fragment_splash_pos.xml
index 9314eba8..0bd20b9d 100644
--- a/app/src/main/res/layout/fragment_splash_pos.xml
+++ b/app/src/main/res/layout/fragment_splash_pos.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.splash.SplashPosFragment">
+    tools:context=".ui.splashScreen.PosFragment">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/splashPosTitleCard"
diff --git a/app/src/main/res/layout/fragment_splash_tle.xml b/app/src/main/res/layout/fragment_splash_tle.xml
index 24f5c189..36996443 100644
--- a/app/src/main/res/layout/fragment_splash_tle.xml
+++ b/app/src/main/res/layout/fragment_splash_tle.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.splash.SplashTleFragment">
+    tools:context=".ui.splashScreen.TleFragment">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/splashTleTitleCard"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index c01de314..88866ddf 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -25,7 +25,7 @@
 
     <fragment
         android:id="@+id/nav_entries"
-        android:name="com.rtbishop.look4sat.ui.fragments.EntriesFragment"
+        android:name="com.rtbishop.look4sat.ui.mainScreen.EntriesFragment"
         tools:layout="@layout/fragment_entries">
         <action
             android:id="@+id/action_entries_to_passes"
@@ -45,7 +45,7 @@
 
     <fragment
         android:id="@+id/nav_passes"
-        android:name="com.rtbishop.look4sat.ui.fragments.PassesFragment"
+        android:name="com.rtbishop.look4sat.ui.mainScreen.PassesFragment"
         tools:layout="@layout/fragment_passes">
         <action
             android:id="@+id/action_passes_to_polar"
@@ -58,7 +58,7 @@
 
     <fragment
         android:id="@+id/nav_polar"
-        android:name="com.rtbishop.look4sat.ui.fragments.PolarFragment"
+        android:name="com.rtbishop.look4sat.ui.mainScreen.PolarFragment"
         tools:layout="@layout/fragment_polar">
         <action
             android:id="@+id/action_polar_to_passes"
@@ -73,20 +73,20 @@
 
     <fragment
         android:id="@+id/nav_map"
-        android:name="com.rtbishop.look4sat.ui.fragments.MapFragment"
+        android:name="com.rtbishop.look4sat.ui.mainScreen.MapFragment"
         tools:layout="@layout/fragment_map" />
 
     <fragment
         android:id="@+id/nav_prefs"
-        android:name="com.rtbishop.look4sat.ui.fragments.PrefsFragment" />
+        android:name="com.rtbishop.look4sat.ui.mainScreen.PrefsFragment" />
 
     <fragment
         android:id="@+id/nav_info"
-        android:name="com.rtbishop.look4sat.ui.fragments.InfoFragment"
+        android:name="com.rtbishop.look4sat.ui.mainScreen.InfoFragment"
         tools:layout="@layout/fragment_info" />
     <dialog
         android:id="@+id/nav_dialog_sources"
-        android:name="com.rtbishop.look4sat.ui.fragments.SourcesDialog"
+        android:name="com.rtbishop.look4sat.ui.mainScreen.SourcesDialog"
         tools:layout="@layout/dialog_sources" />
 
 </navigation>