Lowercase package names.

68 files changed, 75 insertions, 75 deletions

diff --git a/app/src/main/res/layout/activity_account_posts.xml b/app/src/main/res/layout/activity_account_posts.xml
index 396a6ab3..c49cdf72 100644
--- a/app/src/main/res/layout/activity_account_posts.xml
+++ b/app/src/main/res/layout/activity_account_posts.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_account_posts_activity"
-    tools:context=".Activity.AccountPostsActivity">
+    tools:context=".activities.AccountPostsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_account_posts_activity"
diff --git a/app/src/main/res/layout/activity_account_saved_thing.xml b/app/src/main/res/layout/activity_account_saved_thing.xml
index d297b727..4f12aa4e 100644
--- a/app/src/main/res/layout/activity_account_saved_thing.xml
+++ b/app/src/main/res/layout/activity_account_saved_thing.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_account_saved_thing_activity"
-    tools:context=".Activity.AccountPostsActivity">
+    tools:context=".activities.AccountPostsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_account_saved_thing_activity"
diff --git a/app/src/main/res/layout/activity_comment_full_markdown.xml b/app/src/main/res/layout/activity_comment_full_markdown.xml
index d0dc220c..509ad624 100644
--- a/app/src/main/res/layout/activity_comment_full_markdown.xml
+++ b/app/src/main/res/layout/activity_comment_full_markdown.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_comment_full_markdown_activity"
-    tools:context=".Activity.FullMarkdownActivity">
+    tools:context=".activities.FullMarkdownActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_comment_full_markdown_activity"
diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml
index 20adb1d1..af7affcc 100644
--- a/app/src/main/res/layout/activity_create_multi_reddit.xml
+++ b/app/src/main/res/layout/activity_create_multi_reddit.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_create_multi_reddit_activity"
-    tools:context=".Activity.CreateMultiRedditActivity">
+    tools:context=".activities.CreateMultiRedditActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_create_multi_reddit_activity"
diff --git a/app/src/main/res/layout/activity_custom_theme_listing.xml b/app/src/main/res/layout/activity_custom_theme_listing.xml
index a569f594..92a200af 100644
--- a/app/src/main/res/layout/activity_custom_theme_listing.xml
+++ b/app/src/main/res/layout/activity_custom_theme_listing.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_custom_theme_listing_activity"
-    tools:context=".Activity.CustomThemeListingActivity">
+    tools:context=".activities.CustomThemeListingActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_customize_theme_listing_activity"
diff --git a/app/src/main/res/layout/activity_customize_theme.xml b/app/src/main/res/layout/activity_customize_theme.xml
index 9df359c6..c7183da9 100644
--- a/app/src/main/res/layout/activity_customize_theme.xml
+++ b/app/src/main/res/layout/activity_customize_theme.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:id="@+id/coordinator_customize_theme_activity"
     android:background="?attr/backgroundColor"
-    tools:context=".Activity.CustomizeThemeActivity">
+    tools:context=".activities.CustomizeThemeActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_customize_theme_activity"
diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml
index 740aad93..6970c208 100644
--- a/app/src/main/res/layout/activity_edit_comment.xml
+++ b/app/src/main/res/layout/activity_edit_comment.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_layout_edit_comment_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activity.EditCommentActivity">
+    tools:context=".activities.EditCommentActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_edit_comment_activity"
diff --git a/app/src/main/res/layout/activity_edit_multi_reddit.xml b/app/src/main/res/layout/activity_edit_multi_reddit.xml
index bd6b9a12..408b13c7 100644
--- a/app/src/main/res/layout/activity_edit_multi_reddit.xml
+++ b/app/src/main/res/layout/activity_edit_multi_reddit.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_edit_multi_reddit_activity"
-    tools:context=".Activity.CreateMultiRedditActivity">
+    tools:context=".activities.CreateMultiRedditActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_edit_multi_reddit_activity"
diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml
index a7d0078f..b2bff825 100644
--- a/app/src/main/res/layout/activity_edit_post.xml
+++ b/app/src/main/res/layout/activity_edit_post.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_edit_post_activity"
-    tools:context=".Activity.EditPostActivity">
+    tools:context=".activities.EditPostActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_edit_post_activity"
diff --git a/app/src/main/res/layout/activity_fetch_random_subreddit_or_post.xml b/app/src/main/res/layout/activity_fetch_random_subreddit_or_post.xml
index fb5f5b6f..5072b834 100644
--- a/app/src/main/res/layout/activity_fetch_random_subreddit_or_post.xml
+++ b/app/src/main/res/layout/activity_fetch_random_subreddit_or_post.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/relative_layout_fetch_random_subreddit_or_post_activity"
-    tools:context=".Activity.FetchRandomSubredditOrPostActivity">
+    tools:context=".activities.FetchRandomSubredditOrPostActivity">
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/lottie_animation_view_fetch_random_subreddit_or_post_activity"
diff --git a/app/src/main/res/layout/activity_give_award.xml b/app/src/main/res/layout/activity_give_award.xml
index 4eec2c84..a67e2927 100644
--- a/app/src/main/res/layout/activity_give_award.xml
+++ b/app/src/main/res/layout/activity_give_award.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_layout_give_award_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activity.GiveAwardActivity">
+    tools:context=".activities.GiveAwardActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_give_award_activity"
diff --git a/app/src/main/res/layout/activity_inbox.xml b/app/src/main/res/layout/activity_inbox.xml
index b1c31795..dee4ab8c 100644
--- a/app/src/main/res/layout/activity_inbox.xml
+++ b/app/src/main/res/layout/activity_inbox.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_inbox_activity"
-    tools:context=".Activity.InboxActivity">
+    tools:context=".activities.InboxActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_inbox_activity"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b46b2f26..470a6124 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_login_activity"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.LoginActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.LoginActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_login_activity"
@@ -39,7 +39,7 @@
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family" />
 
-        <ml.docilealligator.infinityforreddit.CustomView.LollipopBugFixedWebView
+        <ml.docilealligator.infinityforreddit.customviews.LollipopBugFixedWebView
             android:id="@+id/webview_login_activity"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_select_user_flair.xml b/app/src/main/res/layout/activity_select_user_flair.xml
index 40e3eb83..92649ebf 100644
--- a/app/src/main/res/layout/activity_select_user_flair.xml
+++ b/app/src/main/res/layout/activity_select_user_flair.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_select_user_flair_activity"
-    tools:context=".Activity.SelectUserFlairActivity">
+    tools:context=".activities.SelectUserFlairActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_select_user_flair_activity"
diff --git a/app/src/main/res/layout/activity_selected_subreddits.xml b/app/src/main/res/layout/activity_selected_subreddits.xml
index 4e7a3364..eade8be2 100644
--- a/app/src/main/res/layout/activity_selected_subreddits.xml
+++ b/app/src/main/res/layout/activity_selected_subreddits.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_selected_subreddits_activity"
-    tools:context=".Activity.AccountPostsActivity">
+    tools:context=".activities.AccountPostsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_selected_subreddits_activity"
diff --git a/app/src/main/res/layout/activity_send_private_message.xml b/app/src/main/res/layout/activity_send_private_message.xml
index 537ff6ef..b70f857b 100644
--- a/app/src/main/res/layout/activity_send_private_message.xml
+++ b/app/src/main/res/layout/activity_send_private_message.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_send_private_message_activity"
-    tools:context=".Activity.SendPrivateMessageActivity">
+    tools:context=".activities.SendPrivateMessageActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_send_private_message_activity"
diff --git a/app/src/main/res/layout/activity_submit_crosspost.xml b/app/src/main/res/layout/activity_submit_crosspost.xml
index 8e15afb1..ec5b1f42 100644
--- a/app/src/main/res/layout/activity_submit_crosspost.xml
+++ b/app/src/main/res/layout/activity_submit_crosspost.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_submit_crosspost_activity"
-    tools:context=".Activity.SubmitCrosspostActivity">
+    tools:context=".activities.SubmitCrosspostActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_submit_crosspost_activity"
diff --git a/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml b/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml
index 6a342718..b854ae21 100644
--- a/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml
+++ b/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_subreddit_filter_popular_and_all_activity"
-    tools:context=".Activity.SubredditFilterPopularAndAllActivity">
+    tools:context=".activities.SubredditFilterPopularAndAllActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_subreddit_filter_popular_and_all_activity"
diff --git a/app/src/main/res/layout/activity_theme_preview.xml b/app/src/main/res/layout/activity_theme_preview.xml
index adc1587f..6ca8a0b0 100644
--- a/app/src/main/res/layout/activity_theme_preview.xml
+++ b/app/src/main/res/layout/activity_theme_preview.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_theme_preview_activity"
-    tools:context=".Activity.CustomThemePreviewActivity">
+    tools:context=".activities.CustomThemePreviewActivity">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager_theme_preview_activity"
diff --git a/app/src/main/res/layout/activity_view_image_or_gif.xml b/app/src/main/res/layout/activity_view_image_or_gif.xml
index 6e53f230..4ecd9fda 100644
--- a/app/src/main/res/layout/activity_view_image_or_gif.xml
+++ b/app/src/main/res/layout/activity_view_image_or_gif.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/black"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewImageActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.ViewImageActivity">
 
     <ProgressBar
         android:id="@+id/progress_bar_view_image_or_gif_activity"
diff --git a/app/src/main/res/layout/activity_view_imgur_media.xml b/app/src/main/res/layout/activity_view_imgur_media.xml
index e727857b..0b29fb8b 100644
--- a/app/src/main/res/layout/activity_view_imgur_media.xml
+++ b/app/src/main/res/layout/activity_view_imgur_media.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:dragUpEnabled="true"
-    tools:context=".Activity.ViewImgurMediaActivity">
+    tools:context=".activities.ViewImgurMediaActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
index 28577883..f5efe407 100644
--- a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_view_multi_reddit_detail_activity"
-    tools:context=".Activity.ViewMultiRedditDetailActivity">
+    tools:context=".activities.ViewMultiRedditDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_view_multi_reddit_detail_activity"
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index d250cb83..2e3479d0 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -38,7 +38,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <ml.docilealligator.infinityforreddit.CustomView.CustomToroContainer
+        <ml.docilealligator.infinityforreddit.customviews.CustomToroContainer
             android:id="@+id/recycler_view_view_post_detail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_view_private_messages.xml b/app/src/main/res/layout/activity_view_private_messages.xml
index bd0bfbe5..c25eabc7 100644
--- a/app/src/main/res/layout/activity_view_private_messages.xml
+++ b/app/src/main/res/layout/activity_view_private_messages.xml
@@ -12,7 +12,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:id="@+id/coordinator_layout_view_private_messages_activity"
-        tools:context=".Activity.ViewPrivateMessagesActivity">
+        tools:context=".activities.ViewPrivateMessagesActivity">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar_layout_view_private_messages_activity"
diff --git a/app/src/main/res/layout/activity_view_reddit_gallery.xml b/app/src/main/res/layout/activity_view_reddit_gallery.xml
index 530d4477..d0bff7c2 100644
--- a/app/src/main/res/layout/activity_view_reddit_gallery.xml
+++ b/app/src/main/res/layout/activity_view_reddit_gallery.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:dragUpEnabled="true"
-    tools:context=".Activity.ViewRedditGalleryActivity">
+    tools:context=".activities.ViewRedditGalleryActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index 1d18f2ab..e4bb353b 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     android:keepScreenOn="true"
     app:dragUpEnabled="true"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewVideoActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.ViewVideoActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 1465b8f5..e28e8138 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_main_activity"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.MainActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_main_activity"
diff --git a/app/src/main/res/layout/fragment_acknowledgement.xml b/app/src/main/res/layout/fragment_acknowledgement.xml
index 716c69e8..d23fea19 100644
--- a/app/src/main/res/layout/fragment_acknowledgement.xml
+++ b/app/src/main/res/layout/fragment_acknowledgement.xml
@@ -3,4 +3,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/recycler_view_acknowledgement_fragment"
-    tools:context="ml.docilealligator.infinityforreddit.Settings.AcknowledgementFragment" />
+    tools:context="ml.docilealligator.infinityforreddit.settings.AcknowledgementFragment" />
diff --git a/app/src/main/res/layout/fragment_comments_listing.xml b/app/src/main/res/layout/fragment_comments_listing.xml
index 9ac463ab..59c8a2d2 100644
--- a/app/src/main/res/layout/fragment_comments_listing.xml
+++ b/app/src/main/res/layout/fragment_comments_listing.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_comments_listing_fragment"
-    tools:application="ml.docilealligator.infinityforreddit.Fragment.CommentsListingFragment">
+    tools:application="ml.docilealligator.infinityforreddit.fragments.CommentsListingFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout_view_comments_listing_fragment"
diff --git a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml
index 9256d044..4c59e488 100644
--- a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingBottom="8dp"
     android:overScrollMode="never"
-    tools:context=".BottomSheetFragment.CopyTextBottomSheetFragment">
+    tools:context=".bottomsheetfragments.CopyTextBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml b/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml
index fa948016..ccf5217d 100644
--- a/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml
+++ b/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".Settings.CustomizeBottomAppBarFragment">
+    tools:context=".settings.CustomizeBottomAppBarFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml
index 03ba6d4d..14585b4a 100644
--- a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml
+++ b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Settings.CustomizeMainPageTabsFragment">
+    tools:context=".settings.CustomizeMainPageTabsFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml
index a209b863..92ef8b02 100644
--- a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".BottomSheetFragment.FABMoreOptionsBottomSheetFragment">
+    tools:context=".bottomsheetfragments.FABMoreOptionsBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml
index b73da09b..c5eba3d4 100644
--- a/app/src/main/res/layout/fragment_font_preview.xml
+++ b/app/src/main/res/layout/fragment_font_preview.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Settings.FontPreviewFragment">
+    tools:context=".settings.FontPreviewFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_inbox.xml b/app/src/main/res/layout/fragment_inbox.xml
index c064a90e..3fcaecbf 100644
--- a/app/src/main/res/layout/fragment_inbox.xml
+++ b/app/src/main/res/layout/fragment_inbox.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragment.InboxFragment">
+    tools:context=".fragments.InboxFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout_inbox_fragment"
diff --git a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
index ccb9ff66..242e95f2 100644
--- a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
+++ b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    tools:context=".Settings.NsfwAndBlurringFragment">
+    tools:context=".settings.NsfwAndBlurringFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml
index e8b3ac0f..46a36ce1 100644
--- a/app/src/main/res/layout/fragment_post.xml
+++ b/app/src/main/res/layout/fragment_post.xml
@@ -3,14 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:application="ml.docilealligator.infinityforreddit.Fragment.PostFragment">
+    tools:application="ml.docilealligator.infinityforreddit.fragments.PostFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout_post_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ml.docilealligator.infinityforreddit.CustomView.CustomToroContainer
+        <ml.docilealligator.infinityforreddit.customviews.CustomToroContainer
             android:id="@+id/recycler_view_post_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml
index b33ab495..cade8c2e 100644
--- a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:overScrollMode="never"
-    tools:context=".BottomSheetFragment.PostCommentSortTypeBottomSheetFragment">
+    tools:context=".bottomsheetfragments.PostCommentSortTypeBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml
index 939d6a43..6b577e7c 100644
--- a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingBottom="8dp"
     android:overScrollMode="never"
-    tools:context=".BottomSheetFragment.PostLayoutBottomSheetFragment">
+    tools:context=".bottomsheetfragments.PostLayoutBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_random_bottom_sheet.xml b/app/src/main/res/layout/fragment_random_bottom_sheet.xml
index 3d7e2bb9..50a7c033 100644
--- a/app/src/main/res/layout/fragment_random_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_random_bottom_sheet.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:context=".BottomSheetFragment.RandomBottomSheetFragment">
+    tools:context=".bottomsheetfragments.RandomBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_sidebar.xml b/app/src/main/res/layout/fragment_sidebar.xml
index 1dc53a1b..a0773c9c 100644
--- a/app/src/main/res/layout/fragment_sidebar.xml
+++ b/app/src/main/res/layout/fragment_sidebar.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:application="ml.docilealligator.infinityforreddit.Fragment.SidebarFragment">
+    tools:application="ml.docilealligator.infinityforreddit.fragments.SidebarFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout_sidebar_fragment"
diff --git a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml
index ac998161..bcd346fb 100644
--- a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingBottom="8dp"
     android:overScrollMode="never"
-    tools:context=".BottomSheetFragment.SortTimeBottomSheetFragment">
+    tools:context=".bottomsheetfragments.SortTimeBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_theme_preview_comments.xml b/app/src/main/res/layout/fragment_theme_preview_comments.xml
index c810b949..08e24fc1 100644
--- a/app/src/main/res/layout/fragment_theme_preview_comments.xml
+++ b/app/src/main/res/layout/fragment_theme_preview_comments.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:context=".Fragment.ThemePreviewCommentsFragment">
+    tools:context=".fragments.ThemePreviewCommentsFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml
index 05c32376..aaf14a30 100644
--- a/app/src/main/res/layout/fragment_theme_preview_posts.xml
+++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:padding="16dp">
 
-                <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+                <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
                     android:id="@+id/icon_gif_image_view_theme_preview_posts_fragment"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
diff --git a/app/src/main/res/layout/fragment_translation.xml b/app/src/main/res/layout/fragment_translation.xml
index 69234bd3..a4a58ed6 100644
--- a/app/src/main/res/layout/fragment_translation.xml
+++ b/app/src/main/res/layout/fragment_translation.xml
@@ -4,4 +4,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/recycler_view_translation_fragment"
-    tools:context=".Settings.TranslationFragment" />
\ No newline at end of file
+    tools:context=".settings.TranslationFragment" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml b/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml
index 2aa8e144..852c53ed 100644
--- a/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingBottom="8dp"
     android:overScrollMode="never"
-    tools:context=".BottomSheetFragment.UrlMenuBottomSheetFragment">
+    tools:context=".bottomsheetfragments.UrlMenuBottomSheetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_view_imgur_images.xml b/app/src/main/res/layout/fragment_view_imgur_images.xml
index 36286c05..7a658b92 100644
--- a/app/src/main/res/layout/fragment_view_imgur_images.xml
+++ b/app/src/main/res/layout/fragment_view_imgur_images.xml
@@ -5,7 +5,7 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragment.ViewImgurImageFragment">
+    tools:context=".fragments.ViewImgurImageFragment">
 
     <ProgressBar
         android:id="@+id/progress_bar_view_imgur_image_fragment"
diff --git a/app/src/main/res/layout/fragment_view_imgur_video.xml b/app/src/main/res/layout/fragment_view_imgur_video.xml
index 2947d11f..19331536 100644
--- a/app/src/main/res/layout/fragment_view_imgur_video.xml
+++ b/app/src/main/res/layout/fragment_view_imgur_video.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".Fragment.ViewImgurVideoFragment">
+    tools:context=".fragments.ViewImgurVideoFragment">
 
     <com.google.android.exoplayer2.ui.PlayerView
         android:id="@+id/player_view_view_imgur_video_fragment"
diff --git a/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml b/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml
index 6f27275a..7f27835d 100644
--- a/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml
+++ b/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml
@@ -5,7 +5,7 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragment.ViewImgurImageFragment">
+    tools:context=".fragments.ViewImgurImageFragment">
 
     <ProgressBar
         android:id="@+id/progress_bar_view_reddit_gallery_image_or_gif_fragment"
diff --git a/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml b/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml
index 92e73d84..18b0a2ce 100644
--- a/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml
+++ b/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".Fragment.ViewRedditGalleryVideoFragment">
+    tools:context=".fragments.ViewRedditGalleryVideoFragment">
 
     <com.google.android.exoplayer2.ui.PlayerView
         android:id="@+id/player_view_view_reddit_gallery_video_fragment"
diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml
index 36dcfc60..309eedb5 100644
--- a/app/src/main/res/layout/item_post_compact.xml
+++ b/app/src/main/res/layout/item_post_compact.xml
@@ -14,7 +14,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="8dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_compact"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml
index 92a8c4c5..3fbe55e6 100644
--- a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml
+++ b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml
@@ -13,7 +13,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="8dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_compact_right_thumbnail"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_detail_gallery.xml b/app/src/main/res/layout/item_post_detail_gallery.xml
index 321a7638..a1c3145e 100644
--- a/app/src/main/res/layout/item_post_detail_gallery.xml
+++ b/app/src/main/res/layout/item_post_detail_gallery.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_gallery"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -200,7 +200,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/image_view_item_post_detail_gallery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml
index 2d3e70f0..9bc41c08 100644
--- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml
+++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_image_and_gif_autoplay"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -199,7 +199,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/image_view_item_post_detail_image_and_gif_autoplay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml
index 9266e19e..12281d4b 100644
--- a/app/src/main/res/layout/item_post_detail_link.xml
+++ b/app/src/main/res/layout/item_post_detail_link.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_link"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -209,7 +209,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/image_view_item_post_detail_link"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_post_detail_no_preview.xml b/app/src/main/res/layout/item_post_detail_no_preview.xml
index de21d76f..e9870f3a 100644
--- a/app/src/main/res/layout/item_post_detail_no_preview.xml
+++ b/app/src/main/res/layout/item_post_detail_no_preview.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_no_preview_link"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml
index 289fdec2..6eb3e735 100644
--- a/app/src/main/res/layout/item_post_detail_text.xml
+++ b/app/src/main/res/layout/item_post_detail_text.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_text"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml
index c2c448cb..efb79466 100644
--- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml
+++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_video_and_gif_preview"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -201,7 +201,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+            <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
                 android:id="@+id/image_view_item_post_detail_video_and_gif_preview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml
index 79e32dd7..556a9aff 100644
--- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml
+++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail_video_autoplay"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml
index e7d1867b..1d1dbce0 100644
--- a/app/src/main/res/layout/item_post_text.xml
+++ b/app/src/main/res/layout/item_post_text.xml
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:padding="16dp">
 
-            <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+            <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
                 android:id="@+id/icon_gif_image_view_item_post_text_type"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml
index b68c9231..0485f249 100644
--- a/app/src/main/res/layout/item_post_video_type_autoplay.xml
+++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:padding="16dp">
 
-            <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+            <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
                 android:id="@+id/icon_gif_image_view_item_post_video_type_autoplay"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml
index 45bb6a1f..0e7b65b3 100644
--- a/app/src/main/res/layout/item_post_with_preview.xml
+++ b/app/src/main/res/layout/item_post_with_preview.xml
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:padding="16dp">
 
-            <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+            <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
                 android:id="@+id/icon_gif_image_view_item_post_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -227,7 +227,7 @@
             android:layout_height="wrap_content"
             android:visibility="gone">
 
-            <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
+            <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
                 android:id="@+id/image_view_item_post_with_preview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/account_saved_thing_activity.xml b/app/src/main/res/menu/account_saved_thing_activity.xml
index b1e828b7..483c27a3 100644
--- a/app/src/main/res/menu/account_saved_thing_activity.xml
+++ b/app/src/main/res/menu/account_saved_thing_activity.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.AccountSavedThingActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.AccountSavedThingActivity">
     <item
         android:id="@+id/action_refresh_account_saved_thing_activity"
         android:orderInCategory="1"
diff --git a/app/src/main/res/menu/main_activity.xml b/app/src/main/res/menu/main_activity.xml
index 2e3062b1..f4e275bc 100644
--- a/app/src/main/res/menu/main_activity.xml
+++ b/app/src/main/res/menu/main_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.MainActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.MainActivity">
 
     <item
         android:id="@+id/action_search_main_activity"
diff --git a/app/src/main/res/menu/search_activity.xml b/app/src/main/res/menu/search_activity.xml
index 94119685..b7abcc32 100644
--- a/app/src/main/res/menu/search_activity.xml
+++ b/app/src/main/res/menu/search_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.SearchResultActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.SearchResultActivity">
     <item
         android:id="@+id/action_search_search_activity"
         android:orderInCategory="1"
diff --git a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
index 0da0d682..c214a6d3 100644
--- a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewMultiRedditDetailActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.ViewMultiRedditDetailActivity">
     <item
         android:id="@+id/action_sort_view_multi_reddit_detail_activity"
         android:orderInCategory="1"
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index 67a7bf24..f9a8cffc 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity">
     <item
         android:id="@+id/action_sort_view_subreddit_detail_activity"
         android:orderInCategory="1"
diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml
index a06c2677..dcaa01a0 100644
--- a/app/src/main/res/menu/view_user_detail_activity.xml
+++ b/app/src/main/res/menu/view_user_detail_activity.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity">
     <item
         android:id="@+id/action_sort_view_user_detail_activity"
         android:orderInCategory="1"