418 files changed, 1555 insertions, 1557 deletions

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d3f74dda..62e352e4 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -9,7 +9,7 @@
 ## Preferences reflection
 -keep class * extends androidx.preference.PreferenceFragmentCompat
 
--keep class ml.docilealligator.infinityforreddit.Settings.FontPreviewFragment { *; }
+-keep class ml.docilealligator.infinityforreddit.settings.FontPreviewFragment { *; }
 
 ## EventBus Rules
 -keepattributes *Annotation*
@@ -62,9 +62,9 @@
 #-keep class com.google.gson.stream.** { *; }
 
 # Application classes that will be serialized/deserialized over Gson
--keep class ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme { <fields>; }
--keep class ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditJSONModel { <fields>; }
--keep class ml.docilealligator.infinityforreddit.MultiReddit.SubredditInMultiReddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.customtheme.CustomTheme { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.multireddit.MultiRedditJSONModel { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.multireddit.SubredditInMultiReddit { <fields>; }
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cc5c3161..d3ad80b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,118 +32,118 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:label">
-        <activity android:name=".Activity.SubredditFilterPopularAndAllActivity"
+        <activity android:name=".activities.SubredditFilterPopularAndAllActivity"
             android:label="@string/subreddit_filter_popular_and_all_activity_label"
-            android:parentActivityName=".Activity.SettingsActivity"
+            android:parentActivityName=".activities.SettingsActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.FetchRandomSubredditOrPostActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.FetchRandomSubredditOrPostActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".Activity.GiveAwardActivity"
+            android:name=".activities.GiveAwardActivity"
             android:label="@string/give_award_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.SelectUserFlairActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.SelectUserFlairActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.FullMarkdownActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.FullMarkdownActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.SubmitCrosspostActivity"
+            android:name=".activities.SubmitCrosspostActivity"
             android:label="@string/submit_crosspost_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
 
         <service
-            android:name=".Service.DownloadMediaService"
+            android:name=".services.DownloadMediaService"
             android:enabled="true"
             android:exported="false" />
 
         <activity
-            android:name=".Activity.ViewRedditGalleryActivity"
+            android:name=".activities.ViewRedditGalleryActivity"
             android:configChanges="orientation|screenSize|layoutDirection"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Draggable" />
         <activity
-            android:name=".Activity.SendPrivateMessageActivity"
+            android:name=".activities.SendPrivateMessageActivity"
             android:label="@string/send_private_message_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
 
         <service
-            android:name=".Service.DownloadRedditVideoService"
+            android:name=".services.DownloadRedditVideoService"
             android:enabled="true"
             android:exported="false" />
 
         <activity
-            android:name=".Activity.ViewPrivateMessagesActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.ViewPrivateMessagesActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.ViewImgurMediaActivity"
+            android:name=".activities.ViewImgurMediaActivity"
             android:configChanges="orientation|screenSize|layoutDirection"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Draggable" />
         <activity
-            android:name=".Activity.ReportActivity"
+            android:name=".activities.ReportActivity"
             android:label="@string/report_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.SelectedSubredditsActivity"
+            android:name=".activities.SelectedSubredditsActivity"
             android:label="@string/selected_subeddits_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.EditMultiRedditActivity"
+            android:name=".activities.EditMultiRedditActivity"
             android:label="@string/edit_multi_reddit_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.CustomThemePreviewActivity"
+            android:name=".activities.CustomThemePreviewActivity"
             android:label="@string/theme_preview_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.SlidableWithTranslucentWindow" />
         <activity
-            android:name=".Activity.CustomThemeListingActivity"
+            android:name=".activities.CustomThemeListingActivity"
             android:label="@string/custom_theme_listing_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".Activity.CustomizeThemeActivity"
+            android:name=".activities.CustomizeThemeActivity"
             android:label="@string/customize_theme_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".Activity.SubredditMultiselectionActivity"
+            android:name=".activities.SubredditMultiselectionActivity"
             android:label="@string/subreddit_multiselection_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.CreateMultiRedditActivity"
+            android:name=".activities.CreateMultiRedditActivity"
             android:label="@string/create_multi_reddit_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.ViewMultiRedditDetailActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.ViewMultiRedditDetailActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.AccountSavedThingActivity"
+            android:name=".activities.AccountSavedThingActivity"
             android:label="@string/account_saved_thing_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
-        <activity android:name=".Activity.ShareDataResolverActivity">
+        <activity android:name=".activities.ShareDataResolverActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -167,41 +167,41 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".Activity.SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:label="@string/settings_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/PreferenceActivityTheme" />
         <activity
-            android:name=".Activity.InboxActivity"
+            android:name=".activities.InboxActivity"
             android:label="@string/view_message_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.AccountPostsActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.AccountPostsActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.EditCommentActivity"
+            android:name=".activities.EditCommentActivity"
             android:label="@string/edit_comment_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.EditPostActivity"
+            android:name=".activities.EditPostActivity"
             android:label="@string/edit_post_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.FilteredThingActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.FilteredThingActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.SearchSubredditsResultActivity"
+            android:name=".activities.SearchSubredditsResultActivity"
             android:label="@string/search_subreddits_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
-        <activity android:name=".Activity.LinkResolverActivity">
+        <activity android:name=".activities.LinkResolverActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -271,63 +271,63 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".Activity.SearchActivity"
+            android:name=".activities.SearchActivity"
             android:label="@string/search_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".Activity.RulesActivity"
+            android:name=".activities.RulesActivity"
             android:label="@string/rules_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.PostVideoActivity"
+            android:name=".activities.PostVideoActivity"
             android:label="@string/post_video_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.PostImageActivity"
+            android:name=".activities.PostImageActivity"
             android:label="@string/post_image_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.PostLinkActivity"
+            android:name=".activities.PostLinkActivity"
             android:label="@string/post_link_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.SubscribedThingListingActivity"
+            android:name=".activities.SubscribedThingListingActivity"
             android:label="@string/subscriptions"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.SubredditSelectionActivity"
+            android:name=".activities.SubredditSelectionActivity"
             android:label="@string/subreddit_selection_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.PostTextActivity"
+            android:name=".activities.PostTextActivity"
             android:label="@string/post_text_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.CommentActivity"
+            android:name=".activities.CommentActivity"
             android:label="@string/comment_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".Activity.SearchResultActivity"
+            android:name=".activities.SearchResultActivity"
             android:label="@string/search_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.MainActivity"
+            android:name=".activities.MainActivity"
             android:label="@string/application_name"
             android:theme="@style/AppTheme.Launcher"
             android:windowSoftInputMode="adjustPan">
@@ -338,30 +338,30 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".Activity.LoginActivity"
+            android:name=".activities.LoginActivity"
             android:label="@string/login_activity_label"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.ViewImageOrGifActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.ViewImageOrGifActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.SlidableWithActionBar" />
         <activity
-            android:name=".Activity.ViewVideoActivity"
+            android:name=".activities.ViewVideoActivity"
             android:configChanges="orientation|screenSize|layoutDirection"
-            android:parentActivityName=".Activity.MainActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Draggable" />
         <activity
-            android:name=".Activity.ViewPostDetailActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.ViewPostDetailActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
-            android:name=".Activity.ViewSubredditDetailActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.ViewSubredditDetailActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.SlidableWithTranslucentWindow" />
         <activity
-            android:name=".Activity.ViewUserDetailActivity"
-            android:parentActivityName=".Activity.MainActivity"
+            android:name=".activities.ViewUserDetailActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.SlidableWithTranslucentWindow" />
 
         <provider
@@ -375,7 +375,7 @@
         </provider>
 
         <service
-            android:name=".Service.SubmitPostService"
+            android:name=".services.SubmitPostService"
             android:enabled="true"
             android:exported="false" />
     </application>
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java
index 408d180d..19407839 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java
@@ -10,9 +10,9 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Account.Account;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.account.Account;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import okhttp3.Authenticator;
 import okhttp3.Headers;
 import okhttp3.Request;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java
index 8fc499cb..717a1e83 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java
@@ -3,79 +3,79 @@ package ml.docilealligator.infinityforreddit;
 import javax.inject.Singleton;
 
 import dagger.Component;
-import ml.docilealligator.infinityforreddit.Activity.AccountPostsActivity;
-import ml.docilealligator.infinityforreddit.Activity.AccountSavedThingActivity;
-import ml.docilealligator.infinityforreddit.Activity.CommentActivity;
-import ml.docilealligator.infinityforreddit.Activity.FullMarkdownActivity;
-import ml.docilealligator.infinityforreddit.Activity.CreateMultiRedditActivity;
-import ml.docilealligator.infinityforreddit.Activity.CustomThemeListingActivity;
-import ml.docilealligator.infinityforreddit.Activity.CustomThemePreviewActivity;
-import ml.docilealligator.infinityforreddit.Activity.CustomizeThemeActivity;
-import ml.docilealligator.infinityforreddit.Activity.EditCommentActivity;
-import ml.docilealligator.infinityforreddit.Activity.EditMultiRedditActivity;
-import ml.docilealligator.infinityforreddit.Activity.EditPostActivity;
-import ml.docilealligator.infinityforreddit.Activity.FetchRandomSubredditOrPostActivity;
-import ml.docilealligator.infinityforreddit.Activity.FilteredThingActivity;
-import ml.docilealligator.infinityforreddit.Activity.GiveAwardActivity;
-import ml.docilealligator.infinityforreddit.Activity.InboxActivity;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.LoginActivity;
-import ml.docilealligator.infinityforreddit.Activity.MainActivity;
-import ml.docilealligator.infinityforreddit.Activity.PostImageActivity;
-import ml.docilealligator.infinityforreddit.Activity.PostLinkActivity;
-import ml.docilealligator.infinityforreddit.Activity.PostTextActivity;
-import ml.docilealligator.infinityforreddit.Activity.PostVideoActivity;
-import ml.docilealligator.infinityforreddit.Activity.ReportActivity;
-import ml.docilealligator.infinityforreddit.Activity.RulesActivity;
-import ml.docilealligator.infinityforreddit.Activity.SearchActivity;
-import ml.docilealligator.infinityforreddit.Activity.SearchResultActivity;
-import ml.docilealligator.infinityforreddit.Activity.SearchSubredditsResultActivity;
-import ml.docilealligator.infinityforreddit.Activity.SelectUserFlairActivity;
-import ml.docilealligator.infinityforreddit.Activity.SelectedSubredditsActivity;
-import ml.docilealligator.infinityforreddit.Activity.SendPrivateMessageActivity;
-import ml.docilealligator.infinityforreddit.Activity.SettingsActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubmitCrosspostActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubredditFilterPopularAndAllActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubredditMultiselectionActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubredditSelectionActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubscribedThingListingActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewImageOrGifActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewImgurMediaActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewMultiRedditDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPostDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPrivateMessagesActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewRedditGalleryActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewVideoActivity;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.Fragment.CommentsListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.FollowedUsersListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.InboxFragment;
-import ml.docilealligator.infinityforreddit.Fragment.MultiRedditListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
-import ml.docilealligator.infinityforreddit.Fragment.SidebarFragment;
-import ml.docilealligator.infinityforreddit.Fragment.SubredditListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.SubscribedSubredditsListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.UserListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.ViewImgurVideoFragment;
-import ml.docilealligator.infinityforreddit.Fragment.ViewRedditGalleryVideoFragment;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
-import ml.docilealligator.infinityforreddit.Service.DownloadRedditVideoService;
-import ml.docilealligator.infinityforreddit.Service.SubmitPostService;
-import ml.docilealligator.infinityforreddit.Settings.AdvancedPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.CustomizeBottomAppBarFragment;
-import ml.docilealligator.infinityforreddit.Settings.CustomizeMainPageTabsFragment;
-import ml.docilealligator.infinityforreddit.Settings.DownloadLocationPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.MiscellaneousPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.NsfwAndBlurringFragment;
-import ml.docilealligator.infinityforreddit.Settings.SecurityPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.ThemePreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.TranslationFragment;
-import ml.docilealligator.infinityforreddit.Settings.VideoPreferenceFragment;
+import ml.docilealligator.infinityforreddit.activities.AccountPostsActivity;
+import ml.docilealligator.infinityforreddit.activities.AccountSavedThingActivity;
+import ml.docilealligator.infinityforreddit.activities.CommentActivity;
+import ml.docilealligator.infinityforreddit.activities.FullMarkdownActivity;
+import ml.docilealligator.infinityforreddit.activities.CreateMultiRedditActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomThemeListingActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomThemePreviewActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomizeThemeActivity;
+import ml.docilealligator.infinityforreddit.activities.EditCommentActivity;
+import ml.docilealligator.infinityforreddit.activities.EditMultiRedditActivity;
+import ml.docilealligator.infinityforreddit.activities.EditPostActivity;
+import ml.docilealligator.infinityforreddit.activities.FetchRandomSubredditOrPostActivity;
+import ml.docilealligator.infinityforreddit.activities.FilteredThingActivity;
+import ml.docilealligator.infinityforreddit.activities.GiveAwardActivity;
+import ml.docilealligator.infinityforreddit.activities.InboxActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.LoginActivity;
+import ml.docilealligator.infinityforreddit.activities.MainActivity;
+import ml.docilealligator.infinityforreddit.activities.PostImageActivity;
+import ml.docilealligator.infinityforreddit.activities.PostLinkActivity;
+import ml.docilealligator.infinityforreddit.activities.PostTextActivity;
+import ml.docilealligator.infinityforreddit.activities.PostVideoActivity;
+import ml.docilealligator.infinityforreddit.activities.ReportActivity;
+import ml.docilealligator.infinityforreddit.activities.RulesActivity;
+import ml.docilealligator.infinityforreddit.activities.SearchActivity;
+import ml.docilealligator.infinityforreddit.activities.SearchResultActivity;
+import ml.docilealligator.infinityforreddit.activities.SearchSubredditsResultActivity;
+import ml.docilealligator.infinityforreddit.activities.SelectUserFlairActivity;
+import ml.docilealligator.infinityforreddit.activities.SelectedSubredditsActivity;
+import ml.docilealligator.infinityforreddit.activities.SendPrivateMessageActivity;
+import ml.docilealligator.infinityforreddit.activities.SettingsActivity;
+import ml.docilealligator.infinityforreddit.activities.SubmitCrosspostActivity;
+import ml.docilealligator.infinityforreddit.activities.SubredditFilterPopularAndAllActivity;
+import ml.docilealligator.infinityforreddit.activities.SubredditMultiselectionActivity;
+import ml.docilealligator.infinityforreddit.activities.SubredditSelectionActivity;
+import ml.docilealligator.infinityforreddit.activities.SubscribedThingListingActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewImageOrGifActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewImgurMediaActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewMultiRedditDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPostDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPrivateMessagesActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewRedditGalleryActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewVideoActivity;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.fragments.CommentsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.FollowedUsersListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.InboxFragment;
+import ml.docilealligator.infinityforreddit.fragments.MultiRedditListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
+import ml.docilealligator.infinityforreddit.fragments.SidebarFragment;
+import ml.docilealligator.infinityforreddit.fragments.SubredditListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.SubscribedSubredditsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.UserListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.ViewImgurVideoFragment;
+import ml.docilealligator.infinityforreddit.fragments.ViewRedditGalleryVideoFragment;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.services.DownloadRedditVideoService;
+import ml.docilealligator.infinityforreddit.services.SubmitPostService;
+import ml.docilealligator.infinityforreddit.settings.AdvancedPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.CustomizeBottomAppBarFragment;
+import ml.docilealligator.infinityforreddit.settings.CustomizeMainPageTabsFragment;
+import ml.docilealligator.infinityforreddit.settings.DownloadLocationPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.GesturesAndButtonsPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.MainPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.MiscellaneousPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.NotificationPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.NsfwAndBlurringFragment;
+import ml.docilealligator.infinityforreddit.settings.SecurityPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.ThemePreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.TranslationFragment;
+import ml.docilealligator.infinityforreddit.settings.VideoPreferenceFragment;
 
 @Singleton
 @Component(modules = AppModule.class)
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AppModule.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AppModule.java
index 18f4ac7d..8e483803 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AppModule.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AppModule.java
@@ -22,10 +22,10 @@ import im.ene.toro.exoplayer.Config;
 import im.ene.toro.exoplayer.ExoCreator;
 import im.ene.toro.exoplayer.MediaSourceBuilder;
 import im.ene.toro.exoplayer.ToroExo;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/DeleteThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/DeleteThing.java
index 9e06de80..0d0d0b0e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/DeleteThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/DeleteThing.java
@@ -5,8 +5,8 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/GoBackToMainPageEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Event/GoBackToMainPageEvent.java
deleted file mode 100644
index 8457d6dc..00000000
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/GoBackToMainPageEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ml.docilealligator.infinityforreddit.Event;
-
-public class GoBackToMainPageEvent {
-}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RecreateActivityEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RecreateActivityEvent.java
deleted file mode 100644
index 35fe54a1..00000000
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RecreateActivityEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ml.docilealligator.infinityforreddit.Event;
-
-public class RecreateActivityEvent {
-}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RefreshMultiRedditsEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RefreshMultiRedditsEvent.java
deleted file mode 100644
index 0b0ccf3f..00000000
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RefreshMultiRedditsEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ml.docilealligator.infinityforreddit.Event;
-
-public class RefreshMultiRedditsEvent {
-}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FavoriteThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FavoriteThing.java
index 0333a6df..1bc7b002 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FavoriteThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FavoriteThing.java
@@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertSubscribedThingsAsyncTask;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertSubscribedThingsAsyncTask;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchFlairs.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchFlairs.java
index b00d52d3..42384e78 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchFlairs.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchFlairs.java
@@ -9,9 +9,9 @@ import org.json.JSONException;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchGfycatOrRedgifsVideoLinks.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchGfycatOrRedgifsVideoLinks.java
index 4567fe85..32769529 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchGfycatOrRedgifsVideoLinks.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchGfycatOrRedgifsVideoLinks.java
@@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import ml.docilealligator.infinityforreddit.API.GfycatAPI;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.apis.GfycatAPI;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMyInfo.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMyInfo.java
index 739cea6f..b1ac07eb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMyInfo.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMyInfo.java
@@ -8,9 +8,9 @@ import androidx.annotation.NonNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchRules.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchRules.java
index 877c614c..69f0fa58 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchRules.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchRules.java
@@ -10,9 +10,9 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java
index 7f2a4773..d40291c0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java
@@ -4,11 +4,11 @@ import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserFlairs.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserFlairs.java
index 5d3586bc..86ae73cb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserFlairs.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserFlairs.java
@@ -11,9 +11,9 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java
index a93327bc..4d17d9d3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java
@@ -15,9 +15,9 @@ import com.melegy.redscreenofdeath.RedScreenOfDeath;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.BroadcastReceiver.NetworkWifiStatusReceiver;
-import ml.docilealligator.infinityforreddit.Event.ChangeNetworkStatusEvent;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.broadcastreceivers.NetworkWifiStatusReceiver;
+import ml.docilealligator.infinityforreddit.events.ChangeNetworkStatusEvent;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import ml.docilealligator.inifinityforreddit.EventBusIndex;
 
 public class Infinity extends Application {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java
index 40f40146..68efd8c0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java
@@ -8,10 +8,10 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 
 class ParseSubscribedThing {
     static void parseSubscribedSubreddits(String response, String accountName,
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java
index 1b1134b9..82260f00 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java
@@ -26,18 +26,18 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Account.Account;
-import ml.docilealligator.infinityforreddit.Activity.InboxActivity;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Message.FetchMessage;
-import ml.docilealligator.infinityforreddit.Message.Message;
-import ml.docilealligator.infinityforreddit.Message.ParseMessage;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.NotificationUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.account.Account;
+import ml.docilealligator.infinityforreddit.activities.InboxActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.message.FetchMessage;
+import ml.docilealligator.infinityforreddit.message.Message;
+import ml.docilealligator.infinityforreddit.message.ParseMessage;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.NotificationUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Call;
 import retrofit2.Response;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
index 2d4c1301..6c376569 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
@@ -10,24 +10,24 @@ import androidx.room.RoomDatabase;
 import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
-import ml.docilealligator.infinityforreddit.Account.AccountDao;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeDao;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditDao;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.RecentSearchQuery;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.RecentSearchQueryDao;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditDao;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilterDao;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditDao;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.User.UserDao;
-import ml.docilealligator.infinityforreddit.User.UserData;
+import ml.docilealligator.infinityforreddit.account.Account;
+import ml.docilealligator.infinityforreddit.account.AccountDao;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeDao;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.MultiRedditDao;
+import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQuery;
+import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQueryDao;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditDao;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilterDao;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditDao;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserDao;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.user.UserDao;
+import ml.docilealligator.infinityforreddit.user.UserData;
 
 @Database(entities = {Account.class, SubredditData.class, SubscribedSubredditData.class, UserData.class,
         SubscribedUserData.class, MultiReddit.class, CustomTheme.class, RecentSearchQuery.class, SubredditFilter.class}, version = 13)
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ReportThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ReportThing.java
index 305da882..dc69a541 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ReportThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ReportThing.java
@@ -5,8 +5,8 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SaveThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SaveThing.java
index 4b510d8c..262a22d4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SaveThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SaveThing.java
@@ -5,8 +5,8 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SelectUserFlair.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SelectUserFlair.java
index 92761426..e2607976 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SelectUserFlair.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SelectUserFlair.java
@@ -12,9 +12,9 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/VoteThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/VoteThing.java
index bb0264bf..9fb23c86 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/VoteThing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/VoteThing.java
@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/WallpaperSetter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/WallpaperSetter.java
index f1407bab..e121ffcb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/WallpaperSetter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/WallpaperSetter.java
@@ -14,7 +14,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 
-import ml.docilealligator.infinityforreddit.AsyncTask.SetAsWallpaperAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SetAsWallpaperAsyncTask;
 
 public class WallpaperSetter {
     public static final int HOME_SCREEN = 0;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/Account.java b/app/src/main/java/ml/docilealligator/infinityforreddit/account/Account.java
index 4cb202b5..200faaab 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/Account.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/account/Account.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Account;
+package ml.docilealligator.infinityforreddit.account;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/account/AccountDao.java
index be3dcd9d..076f76f1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/account/AccountDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Account;
+package ml.docilealligator.infinityforreddit.account;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/account/AccountRepository.java
index 70fccd02..933d8d74 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/account/AccountRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Account;
+package ml.docilealligator.infinityforreddit.account;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/account/AccountViewModel.java
index 0eab1570..195f6e39 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/account/AccountViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Account;
+package ml.docilealligator.infinityforreddit.account;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/AccountPostsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/AccountPostsActivity.java
index aa8cff71..74cf5393 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/AccountPostsActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/AccountPostsActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -28,20 +28,20 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class AccountPostsActivity extends BaseActivity implements SortTypeSelectionCallback,
         PostLayoutBottomSheetFragment.PostLayoutSelectionCallback, ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/AccountSavedThingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/AccountSavedThingActivity.java
index d278848c..46b474fc 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/AccountSavedThingActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/AccountSavedThingActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -36,19 +36,19 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.CommentsListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.CommentsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class AccountSavedThingActivity extends BaseActivity implements ActivityToolbarInterface,
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java
index 2d9c17d9..e01c0430 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
@@ -32,16 +32,16 @@ import java.lang.reflect.Field;
 
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
 import ml.docilealligator.infinityforreddit.AppBarStateChangeListener;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Font.ContentFontFamily;
-import ml.docilealligator.infinityforreddit.Font.ContentFontStyle;
-import ml.docilealligator.infinityforreddit.Font.FontFamily;
-import ml.docilealligator.infinityforreddit.Font.FontStyle;
-import ml.docilealligator.infinityforreddit.Font.TitleFontFamily;
-import ml.docilealligator.infinityforreddit.Font.TitleFontStyle;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.font.ContentFontFamily;
+import ml.docilealligator.infinityforreddit.font.ContentFontStyle;
+import ml.docilealligator.infinityforreddit.font.FontFamily;
+import ml.docilealligator.infinityforreddit.font.FontStyle;
+import ml.docilealligator.infinityforreddit.font.TitleFontFamily;
+import ml.docilealligator.infinityforreddit.font.TitleFontStyle;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java
index 31e0a35f..c12403de 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -47,17 +47,17 @@ import io.noties.markwon.recycler.MarkwonAdapter;
 import io.noties.markwon.recycler.table.TableEntry;
 import io.noties.markwon.recycler.table.TableEntryPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
-import ml.docilealligator.infinityforreddit.Adapter.MarkdownBottomBarRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CopyTextBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.Comment.Comment;
-import ml.docilealligator.infinityforreddit.Comment.SendComment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.adapters.MarkdownBottomBarRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CopyTextBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.comment.Comment;
+import ml.docilealligator.infinityforreddit.comment.SendComment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Retrofit;
 
 public class CommentActivity extends BaseActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CreateMultiRedditActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CreateMultiRedditActivity.java
index 3fff7dae..f44f34d3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CreateMultiRedditActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CreateMultiRedditActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -29,14 +29,14 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.MultiReddit.CreateMultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditJSONModel;
+import ml.docilealligator.infinityforreddit.multireddit.CreateMultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.MultiRedditJSONModel;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class CreateMultiRedditActivity extends BaseActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CustomThemeListingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemeListingActivity.java
index 4b7fc12c..c30cc188 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CustomThemeListingActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemeListingActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -33,21 +33,21 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.CustomThemeListingRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.ChangeThemeNameAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteThemeAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCustomThemeAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertCustomThemeAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CreateThemeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CustomThemeOptionsBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeViewModel;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.adapters.CustomThemeListingRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.ChangeThemeNameAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteThemeAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCustomThemeAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertCustomThemeAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CreateThemeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CustomThemeOptionsBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeViewModel;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
 
 import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CustomThemePreviewActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java
index dd873679..dbd40c31 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CustomThemePreviewActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
@@ -43,16 +43,16 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.AppBarStateChangeListener;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeSettingsItem;
-import ml.docilealligator.infinityforreddit.Font.ContentFontStyle;
-import ml.docilealligator.infinityforreddit.Font.FontStyle;
-import ml.docilealligator.infinityforreddit.Font.TitleFontStyle;
-import ml.docilealligator.infinityforreddit.Fragment.ThemePreviewCommentsFragment;
-import ml.docilealligator.infinityforreddit.Fragment.ThemePreviewPostsFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeSettingsItem;
+import ml.docilealligator.infinityforreddit.font.ContentFontStyle;
+import ml.docilealligator.infinityforreddit.font.FontStyle;
+import ml.docilealligator.infinityforreddit.font.TitleFontStyle;
+import ml.docilealligator.infinityforreddit.fragments.ThemePreviewCommentsFragment;
+import ml.docilealligator.infinityforreddit.fragments.ThemePreviewPostsFragment;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CustomizeThemeActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeThemeActivity.java
index 0d206237..a0b41cc2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CustomizeThemeActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeThemeActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -26,17 +26,17 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.CustomizeThemeRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCustomThemeAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertCustomThemeAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeSettingsItem;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.adapters.CustomizeThemeRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCustomThemeAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertCustomThemeAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeSettingsItem;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
 
 public class CustomizeThemeActivity extends BaseActivity {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditCommentActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditCommentActivity.java
index 14c875be..dd57f763 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditCommentActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditCommentActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -32,14 +32,14 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Adapter.MarkdownBottomBarRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.adapters.MarkdownBottomBarRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditMultiRedditActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditMultiRedditActivity.java
index 421b495d..ab3ddfd3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditMultiRedditActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditMultiRedditActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -29,16 +29,16 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.MultiReddit.EditMultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.FetchMultiRedditInfo;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditJSONModel;
+import ml.docilealligator.infinityforreddit.multireddit.EditMultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.FetchMultiRedditInfo;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.MultiRedditJSONModel;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class EditMultiRedditActivity extends BaseActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditPostActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditPostActivity.java
index a773a386..4be61c75 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditPostActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditPostActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -35,14 +35,14 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Adapter.MarkdownBottomBarRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.adapters.MarkdownBottomBarRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/FetchRandomSubredditOrPostActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/FetchRandomSubredditOrPostActivity.java
index ebc87764..ab1722f2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/FetchRandomSubredditOrPostActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/FetchRandomSubredditOrPostActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -13,10 +13,10 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.RandomBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.RandomBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.FetchPost;
+import ml.docilealligator.infinityforreddit.post.FetchPost;
 import ml.docilealligator.infinityforreddit.R;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/FilteredThingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/FilteredThingActivity.java
index 02f900f5..42a366e9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/FilteredThingActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/FilteredThingActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -28,24 +28,24 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SearchPostSortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTimeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.UserThingSortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SearchPostSortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTimeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.UserThingSortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.Post;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.Post;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class FilteredThingActivity extends BaseActivity implements SortTypeSelectionCallback,
         PostLayoutBottomSheetFragment.PostLayoutSelectionCallback, ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/FullMarkdownActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/FullMarkdownActivity.java
index 5b262503..f874244c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/FullMarkdownActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/FullMarkdownActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -49,11 +49,11 @@ import io.noties.markwon.recycler.MarkwonAdapter;
 import io.noties.markwon.recycler.table.TableEntry;
 import io.noties.markwon.recycler.table.TableEntryPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.CustomView.MarkwonLinearLayoutManager;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customviews.MarkwonLinearLayoutManager;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class FullMarkdownActivity extends BaseActivity {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/GiveAwardActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/GiveAwardActivity.java
index 9b8fec82..50e4eb8e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/GiveAwardActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/GiveAwardActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -30,14 +30,14 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.AwardRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.Award.GiveAward;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.AwardRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.award.GiveAward;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class GiveAwardActivity extends BaseActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/InboxActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/InboxActivity.java
index dfd2af52..f378e1c0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/InboxActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/InboxActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -35,16 +35,16 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SwitchAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.InboxFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SwitchAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.InboxFragment;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.FetchMessage;
+import ml.docilealligator.infinityforreddit.message.FetchMessage;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class InboxActivity extends BaseActivity implements ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java
index 9706d015..a01a69ec 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -18,10 +18,10 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static androidx.browser.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LoginActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java
index 1c634dcd..50866ce4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LoginActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -34,16 +34,16 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.AsyncTask.ParseAndInsertNewAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.asynctasks.ParseAndInsertNewAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FetchMyInfo;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java
index bf354c21..15eb3be1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.app.Activity;
 import android.content.Context;
@@ -55,7 +55,6 @@ import com.google.android.material.tabs.TabLayoutMediator;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -65,45 +64,45 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Account.AccountViewModel;
+import ml.docilealligator.infinityforreddit.account.AccountViewModel;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.NavigationDrawerRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertSubscribedThingsAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SwitchAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SwitchToAnonymousAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FABMoreOptionsBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.RandomBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTimeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.ChangeConfirmToExitEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeDisableSwipingBetweenTabsEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeLockBottomAppBarEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeRequireAuthToAccountSectionEvent;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.adapters.NavigationDrawerRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertSubscribedThingsAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SwitchAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SwitchToAnonymousAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FABMoreOptionsBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.RandomBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTimeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.ChangeConfirmToExitEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDisableSwipingBetweenTabsEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeLockBottomAppBarEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeRequireAuthToAccountSectionEvent;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.FetchMyInfo;
 import ml.docilealligator.infinityforreddit.FetchSubscribedThing;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.ReadMessage;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.message.ReadMessage;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.PullNotificationWorker;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditViewModel;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditViewModel;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Retrofit;
 
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
index 3f0b7e52..a8517925 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -45,18 +45,18 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SubmitImagePostEvent;
-import ml.docilealligator.infinityforreddit.Event.SubmitVideoOrGifPostEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SubmitImagePostEvent;
+import ml.docilealligator.infinityforreddit.events.SubmitVideoOrGifPostEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Service.SubmitPostService;
+import ml.docilealligator.infinityforreddit.services.SubmitPostService;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
index 46f0df8c..2f76cd9d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -35,18 +35,18 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SubmitTextOrLinkPostEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SubmitTextOrLinkPostEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Service.SubmitPostService;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.services.SubmitPostService;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java
index 1ebdab2c..31814057 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -37,19 +37,19 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Adapter.MarkdownBottomBarRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SubmitTextOrLinkPostEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.adapters.MarkdownBottomBarRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SubmitTextOrLinkPostEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Service.SubmitPostService;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.services.SubmitPostService;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
index 38e49c10..fb9bca66 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -47,17 +47,17 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SubmitVideoOrGifPostEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SubmitVideoOrGifPostEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Service.SubmitPostService;
+import ml.docilealligator.infinityforreddit.services.SubmitPostService;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ReportActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ReportActivity.java
index bc70c30d..cc414325 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ReportActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ReportActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -24,9 +24,9 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.ReportReasonRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.ReportReasonRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FetchRules;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
@@ -34,7 +34,7 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.ReportReason;
 import ml.docilealligator.infinityforreddit.ReportThing;
 import ml.docilealligator.infinityforreddit.Rule;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class ReportActivity extends BaseActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/RulesActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/RulesActivity.java
index 8e030da8..0e3021e9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/RulesActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/RulesActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
@@ -30,14 +30,14 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.RulesRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.adapters.RulesRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.FetchRules;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.Rule;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class RulesActivity extends BaseActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java
index 69c637e9..b0b96ccb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.app.Activity;
 import android.content.Context;
@@ -33,17 +33,17 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.SearchActivityRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.adapters.SearchActivityRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.DeleteRecentSearchQuery;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.RecentSearchQuery;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.RecentSearchQueryViewModel;
+import ml.docilealligator.infinityforreddit.recentsearchquery.DeleteRecentSearchQuery;
+import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQuery;
+import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQueryViewModel;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class SearchActivity extends BaseActivity {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchResultActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java
index 89d2faf3..249e6ed2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchResultActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -36,27 +36,27 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SearchPostSortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SearchUserAndSubredditSortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTimeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
-import ml.docilealligator.infinityforreddit.Fragment.SubredditListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.UserListingFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SearchPostSortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SearchUserAndSubredditSortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTimeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
+import ml.docilealligator.infinityforreddit.fragments.SubredditListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.UserListingFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.InsertRecentSearchQuery;
+import ml.docilealligator.infinityforreddit.recentsearchquery.InsertRecentSearchQuery;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class SearchResultActivity extends BaseActivity implements SortTypeSelectionCallback,
         PostLayoutBottomSheetFragment.PostLayoutSelectionCallback, ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchSubredditsResultActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchSubredditsResultActivity.java
index 92affa75..21ebd255 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchSubredditsResultActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchSubredditsResultActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -27,14 +27,14 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.SubredditListingFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.SubredditListingFragment;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class SearchSubredditsResultActivity extends BaseActivity implements ActivityToolbarInterface {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SelectUserFlairActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SelectUserFlairActivity.java
index e90432f3..886a1cd4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SelectUserFlairActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SelectUserFlairActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -29,16 +29,16 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.UserFlairRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.UserFlairRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FetchUserFlairs;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SelectUserFlair;
 import ml.docilealligator.infinityforreddit.UserFlair;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class SelectUserFlairActivity extends BaseActivity implements ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SelectedSubredditsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SelectedSubredditsActivity.java
index 3c9b7aba..f6100535 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SelectedSubredditsActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SelectedSubredditsActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -26,11 +26,11 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.SelectedSubredditsRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.SelectedSubredditsRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class SelectedSubredditsActivity extends BaseActivity implements ActivityToolbarInterface {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SendPrivateMessageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SendPrivateMessageActivity.java
index c000079d..da04e142 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SendPrivateMessageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SendPrivateMessageActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -21,10 +21,10 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.ComposeMessage;
+import ml.docilealligator.infinityforreddit.message.ComposeMessage;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SettingsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
index 10b9b034..f9c8c39e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SettingsActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -21,20 +21,20 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Settings.AboutPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.CustomizeBottomAppBarFragment;
-import ml.docilealligator.infinityforreddit.Settings.CustomizeMainPageTabsFragment;
-import ml.docilealligator.infinityforreddit.Settings.FontPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.InterfacePreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment;
-import ml.docilealligator.infinityforreddit.Settings.NsfwAndBlurringFragment;
+import ml.docilealligator.infinityforreddit.settings.AboutPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.CustomizeBottomAppBarFragment;
+import ml.docilealligator.infinityforreddit.settings.CustomizeMainPageTabsFragment;
+import ml.docilealligator.infinityforreddit.settings.FontPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.GesturesAndButtonsPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.InterfacePreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.MainPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.NsfwAndBlurringFragment;
 
 public class SettingsActivity extends BaseActivity implements
         PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ShareDataResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ShareDataResolverActivity.java
index 66ebc4cf..c2fed537 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ShareDataResolverActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ShareDataResolverActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.net.Uri;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubmitCrosspostActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java
index 37a9258b..04c70dc4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubmitCrosspostActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -45,19 +45,19 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SubmitCrosspostEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SubmitCrosspostEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Service.SubmitPostService;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.services.SubmitPostService;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubredditFilterPopularAndAllActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditFilterPopularAndAllActivity.java
index 55a62e7f..292e65be 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubredditFilterPopularAndAllActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditFilterPopularAndAllActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -25,15 +25,15 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.SubredditFilterRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.SubredditFilterRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubredditFilter.DeleteSubredditFilter;
-import ml.docilealligator.infinityforreddit.SubredditFilter.InsertSubredditFilter;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilterViewModel;
+import ml.docilealligator.infinityforreddit.subredditfilter.DeleteSubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.InsertSubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilterViewModel;
 
 public class SubredditFilterPopularAndAllActivity extends BaseActivity {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubredditMultiselectionActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditMultiselectionActivity.java
index bf7a739b..e77e1437 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubredditMultiselectionActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditMultiselectionActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -36,14 +36,14 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.SubredditMultiselectionRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.SubredditMultiselectionRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class SubredditMultiselectionActivity extends BaseActivity implements ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubredditSelectionActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditSelectionActivity.java
index 3f61568b..3a81c202 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubredditSelectionActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditSelectionActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -31,19 +31,19 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertSubscribedThingsAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertSubscribedThingsAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.FetchSubscribedThing;
-import ml.docilealligator.infinityforreddit.Fragment.SubscribedSubredditsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.SubscribedSubredditsListingFragment;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class SubredditSelectionActivity extends BaseActivity implements ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubscribedThingListingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
index 204baf7b..7ba30bd9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SubscribedThingListingActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -37,28 +37,28 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertMultiRedditAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertSubscribedThingsAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.GoBackToMainPageEvent;
-import ml.docilealligator.infinityforreddit.Event.RefreshMultiRedditsEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertMultiRedditAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertSubscribedThingsAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.GoBackToMainPageEvent;
+import ml.docilealligator.infinityforreddit.events.RefreshMultiRedditsEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.FetchSubscribedThing;
-import ml.docilealligator.infinityforreddit.Fragment.FollowedUsersListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.MultiRedditListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.SubscribedSubredditsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.FollowedUsersListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.MultiRedditListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.SubscribedSubredditsListingFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.MultiReddit.DeleteMultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.FetchMyMultiReddits;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.DeleteMultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.FetchMyMultiReddits;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class SubscribedThingListingActivity extends BaseActivity implements ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewImageOrGifActivity.java
index f580ff16..62ef3ddf 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewImageOrGifActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.Manifest;
 import android.content.Intent;
@@ -52,21 +52,21 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.AsyncTask.SaveBitmapImageToFileAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SaveGIFToFileAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SetAsWallpaperBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.SaveBitmapImageToFileAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SaveGIFToFileAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SetAsWallpaperBottomSheetFragment;
 import ml.docilealligator.infinityforreddit.BuildConfig;
-import ml.docilealligator.infinityforreddit.Font.ContentFontFamily;
-import ml.docilealligator.infinityforreddit.Font.ContentFontStyle;
-import ml.docilealligator.infinityforreddit.Font.FontFamily;
-import ml.docilealligator.infinityforreddit.Font.FontStyle;
-import ml.docilealligator.infinityforreddit.Font.TitleFontFamily;
-import ml.docilealligator.infinityforreddit.Font.TitleFontStyle;
+import ml.docilealligator.infinityforreddit.font.ContentFontFamily;
+import ml.docilealligator.infinityforreddit.font.ContentFontStyle;
+import ml.docilealligator.infinityforreddit.font.FontFamily;
+import ml.docilealligator.infinityforreddit.font.FontStyle;
+import ml.docilealligator.infinityforreddit.font.TitleFontFamily;
+import ml.docilealligator.infinityforreddit.font.TitleFontStyle;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
 import ml.docilealligator.infinityforreddit.SetAsWallpaperCallback;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import ml.docilealligator.infinityforreddit.WallpaperSetter;
 
 public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWallpaperCallback {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewImgurMediaActivity.java
index 5beb5cfd..58898098 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewImgurMediaActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
@@ -34,22 +34,22 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.API.ImgurAPI;
-import ml.docilealligator.infinityforreddit.Font.ContentFontFamily;
-import ml.docilealligator.infinityforreddit.Font.ContentFontStyle;
-import ml.docilealligator.infinityforreddit.Font.FontFamily;
-import ml.docilealligator.infinityforreddit.Font.FontStyle;
-import ml.docilealligator.infinityforreddit.Font.TitleFontFamily;
-import ml.docilealligator.infinityforreddit.Font.TitleFontStyle;
-import ml.docilealligator.infinityforreddit.Fragment.ViewImgurImageFragment;
-import ml.docilealligator.infinityforreddit.Fragment.ViewImgurVideoFragment;
+import ml.docilealligator.infinityforreddit.apis.ImgurAPI;
+import ml.docilealligator.infinityforreddit.font.ContentFontFamily;
+import ml.docilealligator.infinityforreddit.font.ContentFontStyle;
+import ml.docilealligator.infinityforreddit.font.FontFamily;
+import ml.docilealligator.infinityforreddit.font.FontStyle;
+import ml.docilealligator.infinityforreddit.font.TitleFontFamily;
+import ml.docilealligator.infinityforreddit.font.TitleFontStyle;
+import ml.docilealligator.infinityforreddit.fragments.ViewImgurImageFragment;
+import ml.docilealligator.infinityforreddit.fragments.ViewImgurVideoFragment;
 import ml.docilealligator.infinityforreddit.ImgurMedia;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.SetAsWallpaperCallback;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import ml.docilealligator.infinityforreddit.WallpaperSetter;
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java
index 1af66861..72ff2341 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -29,24 +29,24 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTimeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RefreshMultiRedditsEvent;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTimeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RefreshMultiRedditsEvent;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.MultiReddit.DeleteMultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.multireddit.DeleteMultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Retrofit;
 
 public class ViewMultiRedditDetailActivity extends BaseActivity implements SortTypeSelectionCallback,
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
index c2951c14..f3cac524 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -64,44 +64,44 @@ import butterknife.ButterKnife;
 import im.ene.toro.exoplayer.ExoCreator;
 import im.ene.toro.media.PlaybackInfo;
 import im.ene.toro.media.VolumeInfo;
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.CommentAndPostRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SwitchAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FlairBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostCommentSortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.Comment.Comment;
-import ml.docilealligator.infinityforreddit.Comment.FetchComment;
-import ml.docilealligator.infinityforreddit.Comment.FetchRemovedComment;
-import ml.docilealligator.infinityforreddit.Comment.ParseComment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.CustomView.CustomToroContainer;
+import ml.docilealligator.infinityforreddit.adapters.CommentAndPostRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SwitchAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostCommentSortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.comment.Comment;
+import ml.docilealligator.infinityforreddit.comment.FetchComment;
+import ml.docilealligator.infinityforreddit.comment.FetchRemovedComment;
+import ml.docilealligator.infinityforreddit.comment.ParseComment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customviews.CustomToroContainer;
 import ml.docilealligator.infinityforreddit.DeleteThing;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWBlurEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeNetworkStatusEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSpoilerBlurEvent;
-import ml.docilealligator.infinityforreddit.Event.PostUpdateEventToDetailActivity;
-import ml.docilealligator.infinityforreddit.Event.PostUpdateEventToPostList;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWBlurEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNetworkStatusEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSpoilerBlurEvent;
+import ml.docilealligator.infinityforreddit.events.PostUpdateEventToDetailActivity;
+import ml.docilealligator.infinityforreddit.events.PostUpdateEventToPostList;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.ReadMessage;
-import ml.docilealligator.infinityforreddit.Post.FetchPost;
-import ml.docilealligator.infinityforreddit.Post.FetchRemovedPost;
-import ml.docilealligator.infinityforreddit.Post.HidePost;
-import ml.docilealligator.infinityforreddit.Post.ParsePost;
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.message.ReadMessage;
+import ml.docilealligator.infinityforreddit.post.FetchPost;
+import ml.docilealligator.infinityforreddit.post.FetchRemovedPost;
+import ml.docilealligator.infinityforreddit.post.HidePost;
+import ml.docilealligator.infinityforreddit.post.ParsePost;
+import ml.docilealligator.infinityforreddit.post.Post;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SaveThing;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Subreddit.FetchSubredditData;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.subreddit.FetchSubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -109,8 +109,8 @@ import retrofit2.Retrofit;
 
 import static im.ene.toro.media.PlaybackInfo.INDEX_UNSET;
 import static im.ene.toro.media.PlaybackInfo.TIME_UNSET;
-import static ml.docilealligator.infinityforreddit.Activity.CommentActivity.RETURN_EXTRA_COMMENT_DATA_KEY;
-import static ml.docilealligator.infinityforreddit.Activity.CommentActivity.WRITE_COMMENT_REQUEST_CODE;
+import static ml.docilealligator.infinityforreddit.activities.CommentActivity.RETURN_EXTRA_COMMENT_DATA_KEY;
+import static ml.docilealligator.infinityforreddit.activities.CommentActivity.WRITE_COMMENT_REQUEST_CODE;
 
 public class ViewPostDetailActivity extends BaseActivity implements FlairBottomSheetFragment.FlairSelectionCallback,
         SortTypeSelectionCallback, ActivityToolbarInterface {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPrivateMessagesActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPrivateMessagesActivity.java
index 80cff550..d7072ab0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPrivateMessagesActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPrivateMessagesActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -31,15 +31,15 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.PrivateMessagesDetailRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadUserDataAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RepliedToPrivateMessageEvent;
+import ml.docilealligator.infinityforreddit.adapters.PrivateMessagesDetailRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadUserDataAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RepliedToPrivateMessageEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.Message;
-import ml.docilealligator.infinityforreddit.Message.ReadMessage;
-import ml.docilealligator.infinityforreddit.Message.ReplyMessage;
+import ml.docilealligator.infinityforreddit.message.Message;
+import ml.docilealligator.infinityforreddit.message.ReadMessage;
+import ml.docilealligator.infinityforreddit.message.ReplyMessage;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewRedditGalleryActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewRedditGalleryActivity.java
index 6fab69e2..0eaa24c9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewRedditGalleryActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewRedditGalleryActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.SharedPreferences;
 import android.graphics.drawable.ColorDrawable;
@@ -26,19 +26,19 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Font.ContentFontFamily;
-import ml.docilealligator.infinityforreddit.Font.ContentFontStyle;
-import ml.docilealligator.infinityforreddit.Font.FontFamily;
-import ml.docilealligator.infinityforreddit.Font.FontStyle;
-import ml.docilealligator.infinityforreddit.Font.TitleFontFamily;
-import ml.docilealligator.infinityforreddit.Font.TitleFontStyle;
-import ml.docilealligator.infinityforreddit.Fragment.ViewRedditGalleryImageOrGifFragment;
-import ml.docilealligator.infinityforreddit.Fragment.ViewRedditGalleryVideoFragment;
+import ml.docilealligator.infinityforreddit.font.ContentFontFamily;
+import ml.docilealligator.infinityforreddit.font.ContentFontStyle;
+import ml.docilealligator.infinityforreddit.font.FontFamily;
+import ml.docilealligator.infinityforreddit.font.FontStyle;
+import ml.docilealligator.infinityforreddit.font.TitleFontFamily;
+import ml.docilealligator.infinityforreddit.font.TitleFontStyle;
+import ml.docilealligator.infinityforreddit.fragments.ViewRedditGalleryImageOrGifFragment;
+import ml.docilealligator.infinityforreddit.fragments.ViewRedditGalleryVideoFragment;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.SetAsWallpaperCallback;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import ml.docilealligator.infinityforreddit.WallpaperSetter;
 
 public class ViewRedditGalleryActivity extends AppCompatActivity implements SetAsWallpaperCallback {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java
index fd7f23a5..ff6b6875 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -63,36 +63,36 @@ import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
 import ml.docilealligator.infinityforreddit.AppBarStateChangeListener;
-import ml.docilealligator.infinityforreddit.AsyncTask.CheckIsSubscribedToSubredditAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertSubredditDataAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SwitchAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.FABMoreOptionsBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.RandomBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTimeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.GoBackToMainPageEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
-import ml.docilealligator.infinityforreddit.Fragment.SidebarFragment;
+import ml.docilealligator.infinityforreddit.asynctasks.CheckIsSubscribedToSubredditAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertSubredditDataAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SwitchAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.FABMoreOptionsBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.RandomBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTimeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.GoBackToMainPageEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
+import ml.docilealligator.infinityforreddit.fragments.SidebarFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.ReadMessage;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.message.ReadMessage;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.Subreddit.FetchSubredditData;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditSubscription;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.subreddit.FetchSubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditSubscription;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java
index f365dda4..f7b77dbe 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewUserDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -56,35 +56,35 @@ import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
 import ml.docilealligator.infinityforreddit.AppBarStateChangeListener;
-import ml.docilealligator.infinityforreddit.AsyncTask.CheckIsFollowingUserAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SwitchAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.PostLayoutBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SortTimeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.UserThingSortTypeBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.asynctasks.CheckIsFollowingUserAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SwitchAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SortTimeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.UserThingSortTypeBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.DeleteThing;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.SwitchAccountEvent;
-import ml.docilealligator.infinityforreddit.Fragment.CommentsListingFragment;
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
+import ml.docilealligator.infinityforreddit.fragments.CommentsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.ReadMessage;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.message.ReadMessage;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
 import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
-import ml.docilealligator.infinityforreddit.User.BlockUser;
-import ml.docilealligator.infinityforreddit.User.FetchUserData;
-import ml.docilealligator.infinityforreddit.User.UserDao;
-import ml.docilealligator.infinityforreddit.User.UserData;
-import ml.docilealligator.infinityforreddit.User.UserFollowing;
-import ml.docilealligator.infinityforreddit.User.UserViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserDao;
+import ml.docilealligator.infinityforreddit.user.BlockUser;
+import ml.docilealligator.infinityforreddit.user.FetchUserData;
+import ml.docilealligator.infinityforreddit.user.UserDao;
+import ml.docilealligator.infinityforreddit.user.UserData;
+import ml.docilealligator.infinityforreddit.user.UserFollowing;
+import ml.docilealligator.infinityforreddit.user.UserViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
index 77cdc9e7..66bd7b73 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Activity;
+package ml.docilealligator.infinityforreddit.activities;
 
 import android.Manifest;
 import android.content.Intent;
@@ -54,15 +54,15 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.FetchGfycatOrRedgifsVideoLinks;
-import ml.docilealligator.infinityforreddit.Font.ContentFontFamily;
-import ml.docilealligator.infinityforreddit.Font.FontFamily;
-import ml.docilealligator.infinityforreddit.Font.TitleFontFamily;
+import ml.docilealligator.infinityforreddit.font.ContentFontFamily;
+import ml.docilealligator.infinityforreddit.font.FontFamily;
+import ml.docilealligator.infinityforreddit.font.TitleFontFamily;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
-import ml.docilealligator.infinityforreddit.Service.DownloadRedditVideoService;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.services.DownloadRedditVideoService;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Retrofit;
 
 public class ViewVideoActivity extends AppCompatActivity {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/AcknowledgementRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AcknowledgementRecyclerViewAdapter.java
index 3958054a..c6f7ee56 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/AcknowledgementRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AcknowledgementRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,9 +14,9 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Settings.Acknowledgement;
+import ml.docilealligator.infinityforreddit.settings.Acknowledgement;
 
 public class AcknowledgementRecyclerViewAdapter extends RecyclerView.Adapter<AcknowledgementRecyclerViewAdapter.AcknowledgementViewHolder> {
     private ArrayList<Acknowledgement> acknowledgements;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/AwardRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AwardRecyclerViewAdapter.java
index b9cc42d7..5f233a53 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/AwardRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AwardRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,8 +14,8 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Award.Award;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.award.Award;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
 import pl.droidsonroids.gif.GifImageView;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java
index 0114560d..ed9c50df 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -85,39 +85,39 @@ import io.noties.markwon.recycler.table.TableEntryPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Activity.CommentActivity;
-import ml.docilealligator.infinityforreddit.Activity.FilteredThingActivity;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewImageOrGifActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPostDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewRedditGalleryActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewVideoActivity;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadUserDataAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CommentMoreBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CopyTextBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.ShareLinkBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.Comment.Comment;
-import ml.docilealligator.infinityforreddit.Comment.FetchComment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView;
-import ml.docilealligator.infinityforreddit.CustomView.MarkwonLinearLayoutManager;
+import ml.docilealligator.infinityforreddit.activities.CommentActivity;
+import ml.docilealligator.infinityforreddit.activities.FilteredThingActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewImageOrGifActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPostDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewRedditGalleryActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewVideoActivity;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadUserDataAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CommentMoreBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CopyTextBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.ShareLinkBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.comment.Comment;
+import ml.docilealligator.infinityforreddit.comment.FetchComment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView;
+import ml.docilealligator.infinityforreddit.customviews.MarkwonLinearLayoutManager;
 import ml.docilealligator.infinityforreddit.FetchGfycatOrRedgifsVideoLinks;
-import ml.docilealligator.infinityforreddit.Post.Post;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.Post;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SaveThing;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import ml.docilealligator.infinityforreddit.VoteThing;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
-import static ml.docilealligator.infinityforreddit.Activity.CommentActivity.WRITE_COMMENT_REQUEST_CODE;
+import static ml.docilealligator.infinityforreddit.activities.CommentActivity.WRITE_COMMENT_REQUEST_CODE;
 
 public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements CacheManager {
     private static final int VIEW_TYPE_POST_DETAIL_VIDEO_AUTOPLAY = 1;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentsListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsListingRecyclerViewAdapter.java
index 3ab89e83..fad4476f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentsListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsListingRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -46,19 +46,19 @@ import io.noties.markwon.core.MarkwonTheme;
 import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.linkify.LinkifyPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPostDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CommentMoreBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.Comment.Comment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPostDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CommentMoreBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.comment.Comment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.SaveThing;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import ml.docilealligator.infinityforreddit.VoteThing;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CustomThemeListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CustomThemeListingRecyclerViewAdapter.java
index c4ea3963..127c6955 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CustomThemeListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CustomThemeListingRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -18,10 +18,10 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.CustomThemeListingActivity;
-import ml.docilealligator.infinityforreddit.Activity.CustomizeThemeActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.CustomThemeOptionsBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.activities.CustomThemeListingActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomizeThemeActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.CustomThemeOptionsBottomSheetFragment;
 import ml.docilealligator.infinityforreddit.R;
 
 public class CustomThemeListingRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CustomizeThemeRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CustomizeThemeRecyclerViewAdapter.java
index 95833e72..eb8189dd 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CustomizeThemeRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CustomizeThemeRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -20,8 +20,8 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeSettingsItem;
-import ml.docilealligator.infinityforreddit.CustomView.ColorPickerDialog;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeSettingsItem;
+import ml.docilealligator.infinityforreddit.customviews.ColorPickerDialog;
 import ml.docilealligator.infinityforreddit.R;
 
 public class CustomizeThemeRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/FlairBottomSheetRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/FlairBottomSheetRecyclerViewAdapter.java
index 0f016b53..4585c95e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/FlairBottomSheetRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/FlairBottomSheetRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/FollowedUsersRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/FollowedUsersRecyclerViewAdapter.java
index 5e2cf2da..05c85ed1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/FollowedUsersRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/FollowedUsersRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -22,12 +22,12 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import me.zhanghai.android.fastscroll.PopupTextProvider;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FavoriteThing;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MarkdownBottomBarRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java
index e8d2362a..6dd2fff3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MarkdownBottomBarRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.app.Activity;
 import android.view.LayoutInflater;
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.slider.Slider;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
 
 public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MessageRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MessageRecyclerViewAdapter.java
index 58604abd..b4d74f96 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MessageRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MessageRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -37,13 +37,13 @@ import io.noties.markwon.core.MarkwonTheme;
 import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.linkify.LinkifyPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPrivateMessagesActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Message.FetchMessage;
-import ml.docilealligator.infinityforreddit.Message.Message;
-import ml.docilealligator.infinityforreddit.Message.ReadMessage;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPrivateMessagesActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.message.FetchMessage;
+import ml.docilealligator.infinityforreddit.message.Message;
+import ml.docilealligator.infinityforreddit.message.ReadMessage;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MultiRedditListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MultiRedditListingRecyclerViewAdapter.java
index 51939d7f..7dd20529 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MultiRedditListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MultiRedditListingRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -23,11 +23,11 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import me.zhanghai.android.fastscroll.PopupTextProvider;
-import ml.docilealligator.infinityforreddit.Activity.ViewMultiRedditDetailActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.MultiRedditOptionsBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.MultiReddit.FavoriteMultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.activities.ViewMultiRedditDetailActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.MultiRedditOptionsBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.multireddit.FavoriteMultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import pl.droidsonroids.gif.GifImageView;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java
index cdb73759..9d022099 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
@@ -28,11 +28,11 @@ import java.util.concurrent.Executor;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Account.Account;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.account.Account;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import pl.droidsonroids.gif.GifImageView;
 
 import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
index 1928febf..cf53ffb4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -69,31 +69,31 @@ import im.ene.toro.media.PlaybackInfo;
 import im.ene.toro.widget.Container;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Activity.FilteredThingActivity;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewImageOrGifActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPostDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewRedditGalleryActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewVideoActivity;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadSubredditIconAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.LoadUserDataAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.ShareLinkBottomSheetFragment;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView;
-import ml.docilealligator.infinityforreddit.Event.PostUpdateEventToDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.FilteredThingActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewImageOrGifActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPostDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewRedditGalleryActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewVideoActivity;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIconAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.LoadUserDataAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.ShareLinkBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView;
+import ml.docilealligator.infinityforreddit.events.PostUpdateEventToDetailActivity;
 import ml.docilealligator.infinityforreddit.FetchGfycatOrRedgifsVideoLinks;
 import ml.docilealligator.infinityforreddit.NetworkState;
-import ml.docilealligator.infinityforreddit.Post.Post;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.Post;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SaveThing;
-import ml.docilealligator.infinityforreddit.User.UserDao;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.user.UserDao;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import ml.docilealligator.infinityforreddit.VoteThing;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PrivateMessagesDetailRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PrivateMessagesDetailRecyclerViewAdapter.java
index 572db144..f9426006 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PrivateMessagesDetailRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PrivateMessagesDetailRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -31,14 +31,14 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.linkify.LinkifyPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPrivateMessagesActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Message.Message;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPrivateMessagesActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.message.Message;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private static final int VIEW_TYPE_MESSAGE_SENT = 0;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/ReportReasonRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/ReportReasonRecyclerViewAdapter.java
index 8bbc3991..4bb9c255 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/ReportReasonRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/ReportReasonRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.res.ColorStateList;
 import android.view.LayoutInflater;
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.ReportReason;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/RulesRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RulesRecyclerViewAdapter.java
index 2b5e62df..ee728b96 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/RulesRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RulesRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -24,8 +24,8 @@ import io.noties.markwon.core.MarkwonTheme;
 import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.linkify.LinkifyPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.Rule;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SearchActivityRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SearchActivityRecyclerViewAdapter.java
index 75c22934..f4da7bd7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SearchActivityRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SearchActivityRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
@@ -15,10 +15,10 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.RecentSearchQuery.RecentSearchQuery;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQuery;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class SearchActivityRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private List<RecentSearchQuery> recentSearchQueries;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SelectedSubredditsRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SelectedSubredditsRecyclerViewAdapter.java
index ce7c4812..61f4438d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SelectedSubredditsRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SelectedSubredditsRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
 
 public class SelectedSubredditsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubredditFilterRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubredditFilterRecyclerViewAdapter.java
index 28678b40..330eab39 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubredditFilterRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubredditFilterRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,7 +14,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
 
 public class SubredditFilterRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private List<SubredditFilter> subredditFilters;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubredditListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubredditListingRecyclerViewAdapter.java
index 964ecd5d..cec8041a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubredditListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubredditListingRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -25,13 +25,13 @@ import com.bumptech.glide.request.RequestOptions;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.AsyncTask.CheckIsSubscribedToSubredditAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.asynctasks.CheckIsSubscribedToSubredditAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditSubscription;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditSubscription;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubredditMultiselectionRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubredditMultiselectionRecyclerViewAdapter.java
index 6c2d0b87..cb3a3c40 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubredditMultiselectionRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubredditMultiselectionRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -21,10 +21,10 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditWithSelection;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditWithSelection;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
 import pl.droidsonroids.gif.GifImageView;
 
 public class SubredditMultiselectionRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubscribedSubredditsRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubscribedSubredditsRecyclerViewAdapter.java
index 3e557594..9ab3659d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubscribedSubredditsRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SubscribedSubredditsRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -22,12 +22,12 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import me.zhanghai.android.fastscroll.PopupTextProvider;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FavoriteThing;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/TranslationFragmentRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/TranslationFragmentRecyclerViewAdapter.java
index a31381c5..13f792ae 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/TranslationFragmentRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/TranslationFragmentRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -16,10 +16,10 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Settings.Translation;
+import ml.docilealligator.infinityforreddit.settings.Translation;
 
 public class TranslationFragmentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private Activity activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/UserFlairRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/UserFlairRecyclerViewAdapter.java
index a9ae4687..1f05380b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/UserFlairRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/UserFlairRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,10 +13,10 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.UserFlair;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class UserFlairRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private CustomThemeWrapper customThemeWrapper;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/UserListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/UserListingRecyclerViewAdapter.java
index fad8c30a..a7bd4bc3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/UserListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/UserListingRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Adapter;
+package ml.docilealligator.infinityforreddit.adapters;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,14 +26,14 @@ import com.bumptech.glide.request.RequestOptions;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.AsyncTask.CheckIsFollowingUserAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.asynctasks.CheckIsFollowingUserAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
-import ml.docilealligator.infinityforreddit.User.UserData;
-import ml.docilealligator.infinityforreddit.User.UserFollowing;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserDao;
+import ml.docilealligator.infinityforreddit.user.UserData;
+import ml.docilealligator.infinityforreddit.user.UserFollowing;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/API/DownloadFile.java b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/DownloadFile.java
index 10a8dda4..da02ad80 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/API/DownloadFile.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/DownloadFile.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.API;
+package ml.docilealligator.infinityforreddit.apis;
 
 import okhttp3.ResponseBody;
 import retrofit2.Call;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/API/GfycatAPI.java b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/GfycatAPI.java
index 161659b7..14028182 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/API/GfycatAPI.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/GfycatAPI.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.API;
+package ml.docilealligator.infinityforreddit.apis;
 
 import retrofit2.Call;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/API/ImgurAPI.java b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/ImgurAPI.java
index 66058a36..3133b2d5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/API/ImgurAPI.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/ImgurAPI.java
@@ -1,6 +1,6 @@
-package ml.docilealligator.infinityforreddit.API;
+package ml.docilealligator.infinityforreddit.apis;
 
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/API/PushshiftAPI.java b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/PushshiftAPI.java
index 1dc7b411..b19526ae 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/API/PushshiftAPI.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/PushshiftAPI.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.API;
+package ml.docilealligator.infinityforreddit.apis;
 
 import retrofit2.Call;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/API/RedditAPI.java b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java
index 2a9a4711..3bee57fb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/API/RedditAPI.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.API;
+package ml.docilealligator.infinityforreddit.apis;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/ChangeThemeNameAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/ChangeThemeNameAsyncTask.java
index 65fc3b8d..4bc3bef4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/ChangeThemeNameAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/ChangeThemeNameAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/CheckIsFollowingUserAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/CheckIsFollowingUserAsyncTask.java
index 418d0bbe..a34bd0a8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/CheckIsFollowingUserAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/CheckIsFollowingUserAsyncTask.java
@@ -1,9 +1,9 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserDao;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
 
 public class CheckIsFollowingUserAsyncTask extends AsyncTask<Void, Void, Void> {
     private SubscribedUserDao subscribedUserDao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/CheckIsSubscribedToSubredditAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/CheckIsSubscribedToSubredditAsyncTask.java
index a9388bf5..a7aaddd4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/CheckIsSubscribedToSubredditAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/CheckIsSubscribedToSubredditAsyncTask.java
@@ -1,9 +1,9 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
 
 public class CheckIsSubscribedToSubredditAsyncTask extends AsyncTask<Void, Void, Void> {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllPostLayoutsAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllPostLayoutsAsyncTask.java
index 8f844963..a4298f10 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllPostLayoutsAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllPostLayoutsAsyncTask.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class DeleteAllPostLayoutsAsyncTask extends AsyncTask<Void, Void, Void> {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllSortTypesAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllSortTypesAsyncTask.java
index 2e76b6c3..a0d999b5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllSortTypesAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllSortTypesAsyncTask.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class DeleteAllSortTypesAsyncTask extends AsyncTask<Void, Void, Void> {
     private SharedPreferences defaultSharedPreferences;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllSubredditsAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllSubredditsAsyncTask.java
index db39f9c1..f5494224 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllSubredditsAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllSubredditsAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllThemesAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllThemesAsyncTask.java
index 0859fefd..ccf935fb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllThemesAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllThemesAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllUsersAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllUsersAsyncTask.java
index d73f749c..26c20043 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteAllUsersAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteAllUsersAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteMultiredditInDatabaseAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteMultiredditInDatabaseAsyncTask.java
index 14805c9c..61e62244 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteMultiredditInDatabaseAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteMultiredditInDatabaseAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteThemeAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteThemeAsyncTask.java
index c166087c..e33cdbf5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/DeleteThemeAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/DeleteThemeAsyncTask.java
@@ -1,8 +1,8 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 
 public class DeleteThemeAsyncTask extends AsyncTask<Void, Void, Void> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/GetCurrentAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/GetCurrentAccountAsyncTask.java
index 38d67e02..7c495c0a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/GetCurrentAccountAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/GetCurrentAccountAsyncTask.java
@@ -1,9 +1,9 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
-import ml.docilealligator.infinityforreddit.Account.AccountDao;
+import ml.docilealligator.infinityforreddit.account.Account;
+import ml.docilealligator.infinityforreddit.account.AccountDao;
 
 public class GetCurrentAccountAsyncTask extends AsyncTask<Void, Void, Void> {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/GetCustomThemeAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/GetCustomThemeAsyncTask.java
index ffc8771e..62e18f87 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/GetCustomThemeAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/GetCustomThemeAsyncTask.java
@@ -1,10 +1,10 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
 
 public class GetCustomThemeAsyncTask extends AsyncTask<Void, Void, Void> {
     private RedditDataRoomDatabase redditDataRoomDatabase;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertCustomThemeAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertCustomThemeAsyncTask.java
index 86a0f43b..4e46eb47 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertCustomThemeAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertCustomThemeAsyncTask.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
 
 public class InsertCustomThemeAsyncTask extends AsyncTask<Void, Void, Void> {
     private RedditDataRoomDatabase redditDataRoomDatabase;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertMultiRedditAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertMultiRedditAsyncTask.java
index 2c49eccb..b0351966 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertMultiRedditAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertMultiRedditAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
@@ -6,8 +6,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditDao;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.multireddit.MultiRedditDao;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 
 public class InsertMultiRedditAsyncTask extends AsyncTask<Void, Void, Void> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertSubredditDataAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertSubredditDataAsyncTask.java
index 7b3e40f9..c0085540 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertSubredditDataAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertSubredditDataAsyncTask.java
@@ -1,10 +1,10 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditDao;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditDao;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
 
 public class InsertSubredditDataAsyncTask extends AsyncTask<Void, Void, Void> {
     private SubredditDao mSubredditDao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertSubscribedThingsAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertSubscribedThingsAsyncTask.java
index 0a73135e..0d67e183 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertSubscribedThingsAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertSubscribedThingsAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
@@ -9,12 +9,12 @@ import java.util.Collections;
 import java.util.List;
 
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditDao;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditDao;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditDao;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditDao;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserDao;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
 
 public class InsertSubscribedThingsAsyncTask extends AsyncTask<Void, Void, Void> {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertUserDataAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertUserDataAsyncTask.java
index ea12b546..caf2f7f1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/InsertUserDataAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/InsertUserDataAsyncTask.java
@@ -1,9 +1,9 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.User.UserDao;
-import ml.docilealligator.infinityforreddit.User.UserData;
+import ml.docilealligator.infinityforreddit.user.UserDao;
+import ml.docilealligator.infinityforreddit.user.UserData;
 
 public class InsertUserDataAsyncTask extends AsyncTask<Void, Void, Void> {
     private UserDao userDao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/LoadSubredditIconAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/LoadSubredditIconAsyncTask.java
index a89f1064..7092bae7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/LoadSubredditIconAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/LoadSubredditIconAsyncTask.java
@@ -1,13 +1,13 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Subreddit.FetchSubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.FetchSubredditData;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditDao;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditDao;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
 import retrofit2.Retrofit;
 
 public class LoadSubredditIconAsyncTask extends AsyncTask<Void, Void, Void> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/LoadUserDataAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/LoadUserDataAsyncTask.java
index 30c9e039..3386965e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/LoadUserDataAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/LoadUserDataAsyncTask.java
@@ -1,10 +1,10 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.User.FetchUserData;
-import ml.docilealligator.infinityforreddit.User.UserDao;
-import ml.docilealligator.infinityforreddit.User.UserData;
+import ml.docilealligator.infinityforreddit.user.FetchUserData;
+import ml.docilealligator.infinityforreddit.user.UserDao;
+import ml.docilealligator.infinityforreddit.user.UserData;
 import retrofit2.Retrofit;
 
 public class LoadUserDataAsyncTask extends AsyncTask<Void, Void, Void> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/ParseAndInsertNewAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/ParseAndInsertNewAccountAsyncTask.java
index 1a3c23fb..7563803e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/ParseAndInsertNewAccountAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/ParseAndInsertNewAccountAsyncTask.java
@@ -1,9 +1,9 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
-import ml.docilealligator.infinityforreddit.Account.AccountDao;
+import ml.docilealligator.infinityforreddit.account.Account;
+import ml.docilealligator.infinityforreddit.account.AccountDao;
 
 public class ParseAndInsertNewAccountAsyncTask extends AsyncTask<Void, Void, Void> {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SaveBitmapImageToFileAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SaveBitmapImageToFileAsyncTask.java
index f70a87be..7af3fba4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SaveBitmapImageToFileAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SaveBitmapImageToFileAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SaveGIFToFileAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SaveGIFToFileAsyncTask.java
index c1a9ee19..52a86e2c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SaveGIFToFileAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SaveGIFToFileAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SetAsWallpaperAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SetAsWallpaperAsyncTask.java
index b868e5d6..c613cb9c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SetAsWallpaperAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SetAsWallpaperAsyncTask.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.app.WallpaperManager;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SwitchAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SwitchAccountAsyncTask.java
index 8ddf8a94..227e6082 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SwitchAccountAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SwitchAccountAsyncTask.java
@@ -1,8 +1,8 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
+import ml.docilealligator.infinityforreddit.account.Account;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 
 public class SwitchAccountAsyncTask extends AsyncTask<Void, Void, Void> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SwitchToAnonymousAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SwitchToAnonymousAccountAsyncTask.java
index 3ac47124..c0e0da14 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/AsyncTask/SwitchToAnonymousAccountAsyncTask.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/asynctasks/SwitchToAnonymousAccountAsyncTask.java
@@ -1,8 +1,8 @@
-package ml.docilealligator.infinityforreddit.AsyncTask;
+package ml.docilealligator.infinityforreddit.asynctasks;
 
 import android.os.AsyncTask;
 
-import ml.docilealligator.infinityforreddit.Account.AccountDao;
+import ml.docilealligator.infinityforreddit.account.AccountDao;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 
 public class SwitchToAnonymousAccountAsyncTask extends AsyncTask<Void, Void, Void> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Award/Award.java b/app/src/main/java/ml/docilealligator/infinityforreddit/award/Award.java
index ac8effe3..5188702d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Award/Award.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/award/Award.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Award;
+package ml.docilealligator.infinityforreddit.award;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Award/GiveAward.java b/app/src/main/java/ml/docilealligator/infinityforreddit/award/GiveAward.java
index e2596534..a6d7724a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Award/GiveAward.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/award/GiveAward.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Award;
+package ml.docilealligator.infinityforreddit.award;
 
 import android.os.AsyncTask;
 import android.text.Html;
@@ -12,9 +12,9 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CommentMoreBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java
index 198a9965..5f9b4aa6 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CommentMoreBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.content.ActivityNotFoundException;
@@ -21,13 +21,13 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.FullMarkdownActivity;
-import ml.docilealligator.infinityforreddit.Activity.EditCommentActivity;
-import ml.docilealligator.infinityforreddit.Activity.GiveAwardActivity;
-import ml.docilealligator.infinityforreddit.Activity.ReportActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewPostDetailActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewUserDetailActivity;
-import ml.docilealligator.infinityforreddit.Comment.Comment;
+import ml.docilealligator.infinityforreddit.activities.FullMarkdownActivity;
+import ml.docilealligator.infinityforreddit.activities.EditCommentActivity;
+import ml.docilealligator.infinityforreddit.activities.GiveAwardActivity;
+import ml.docilealligator.infinityforreddit.activities.ReportActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewPostDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity;
+import ml.docilealligator.infinityforreddit.comment.Comment;
 import ml.docilealligator.infinityforreddit.R;
 
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CopyTextBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CopyTextBottomSheetFragment.java
index 83cb6569..c96658c8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CopyTextBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CopyTextBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CreateThemeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CreateThemeBottomSheetFragment.java
index 111916d3..163c7732 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CreateThemeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CreateThemeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -16,7 +16,7 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.CustomizeThemeActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomizeThemeActivity;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CustomThemeOptionsBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CustomThemeOptionsBottomSheetFragment.java
index b9a17fef..45d08549 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CustomThemeOptionsBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CustomThemeOptionsBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -17,7 +17,7 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.CustomizeThemeActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomizeThemeActivity;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/FABMoreOptionsBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java
index 2924f34c..a0061ff8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/FABMoreOptionsBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/FlairBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/FlairBottomSheetFragment.java
index 1856eb68..b67a04c9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/FlairBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/FlairBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
@@ -24,8 +24,8 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.FlairBottomSheetRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.FlairBottomSheetRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FetchFlairs;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/MultiRedditOptionsBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/MultiRedditOptionsBottomSheetFragment.java
index 8c7d49cd..e5e20f8b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/MultiRedditOptionsBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/MultiRedditOptionsBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,9 +15,9 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.EditMultiRedditActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubscribedThingListingActivity;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiReddit;
+import ml.docilealligator.infinityforreddit.activities.EditMultiRedditActivity;
+import ml.docilealligator.infinityforreddit.activities.SubscribedThingListingActivity;
+import ml.docilealligator.infinityforreddit.multireddit.MultiReddit;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/PostCommentSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostCommentSortTypeBottomSheetFragment.java
index da747efd..575ceeb8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/PostCommentSortTypeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostCommentSortTypeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/PostLayoutBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostLayoutBottomSheetFragment.java
index c0873a14..13e5c324 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/PostLayoutBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostLayoutBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
@@ -17,7 +17,7 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/PostTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostTypeBottomSheetFragment.java
index 328aeec2..64b604ab 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/PostTypeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostTypeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/RandomBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/RandomBottomSheetFragment.java
index 56763627..fb10efed 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/RandomBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/RandomBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SearchPostSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java
index 12f97c9e..98fe7801 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SearchPostSortTypeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SearchUserAndSubredditSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchUserAndSubredditSortTypeBottomSheetFragment.java
index 0fad6d7b..2c04b848 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SearchUserAndSubredditSortTypeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchUserAndSubredditSortTypeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SetAsWallpaperBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SetAsWallpaperBottomSheetFragment.java
index db6e80e9..05d31cf3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SetAsWallpaperBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SetAsWallpaperBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/ShareLinkBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/ShareLinkBottomSheetFragment.java
index 1214dbc8..bf2f1cc9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/ShareLinkBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/ShareLinkBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
@@ -22,7 +22,7 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SortTimeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTimeBottomSheetFragment.java
index f2f1da4d..65f5c172 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SortTimeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTimeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTypeBottomSheetFragment.java
index d86bb207..40549cd1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/SortTypeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTypeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/UrlMenuBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UrlMenuBottomSheetFragment.java
index f2812232..6ce44743 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/UrlMenuBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UrlMenuBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 import android.app.Activity;
 import android.content.ClipData;
@@ -19,7 +19,7 @@ import com.deishelon.roundedbottomsheet.RoundedBottomSheetDialogFragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
 import ml.docilealligator.infinityforreddit.R;
 
 public class UrlMenuBottomSheetFragment extends RoundedBottomSheetDialogFragment {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/UserThingSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UserThingSortTypeBottomSheetFragment.java
index 2d6b7cae..31524d30 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/UserThingSortTypeBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UserThingSortTypeBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BottomSheetFragment;
+package ml.docilealligator.infinityforreddit.bottomsheetfragments;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/BroadcastReceiver/NetworkWifiStatusReceiver.java b/app/src/main/java/ml/docilealligator/infinityforreddit/broadcastreceivers/NetworkWifiStatusReceiver.java
index fb8d3ae4..fc7355a5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/BroadcastReceiver/NetworkWifiStatusReceiver.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/broadcastreceivers/NetworkWifiStatusReceiver.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.BroadcastReceiver;
+package ml.docilealligator.infinityforreddit.broadcastreceivers;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/Comment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/Comment.java
index 3e5b5328..aa915171 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/Comment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/Comment.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 
 public class Comment implements Parcelable {
     public static final int VOTE_TYPE_NO_VOTE = 0;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/CommentDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/CommentDataSource.java
index 35a8ddd2..42aeaf9e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/CommentDataSource.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/CommentDataSource.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import android.os.AsyncTask;
 
@@ -14,12 +14,12 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.NetworkState;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/CommentDataSourceFactory.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/CommentDataSourceFactory.java
index bd7e5831..6f89215c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/CommentDataSourceFactory.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/CommentDataSourceFactory.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/CommentViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/CommentViewModel.java
index 99832054..9848d499 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/CommentViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/CommentViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/FetchComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchComment.java
index 361a5746..a21335f4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/FetchComment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchComment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -6,8 +6,8 @@ import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/FetchRemovedComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java
index ad774da9..4ce0754a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/FetchRemovedComment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import android.os.AsyncTask;
 
@@ -7,10 +7,9 @@ import androidx.annotation.NonNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import ml.docilealligator.infinityforreddit.API.PushshiftAPI;
-import ml.docilealligator.infinityforreddit.Comment.Comment;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.apis.PushshiftAPI;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/ParseComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/ParseComment.java
index b3c2932f..0b38c530 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/ParseComment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/ParseComment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import android.os.AsyncTask;
 import android.text.Html;
@@ -12,12 +12,12 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
-import static ml.docilealligator.infinityforreddit.Comment.Comment.VOTE_TYPE_DOWNVOTE;
-import static ml.docilealligator.infinityforreddit.Comment.Comment.VOTE_TYPE_NO_VOTE;
-import static ml.docilealligator.infinityforreddit.Comment.Comment.VOTE_TYPE_UPVOTE;
+import static ml.docilealligator.infinityforreddit.comment.Comment.VOTE_TYPE_DOWNVOTE;
+import static ml.docilealligator.infinityforreddit.comment.Comment.VOTE_TYPE_NO_VOTE;
+import static ml.docilealligator.infinityforreddit.comment.Comment.VOTE_TYPE_UPVOTE;
 
 public class ParseComment {
     public static void parseComment(String response, ArrayList<Comment> commentData, Locale locale,
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/SendComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/SendComment.java
index 6991364f..114cc30e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Comment/SendComment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/SendComment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Comment;
+package ml.docilealligator.infinityforreddit.comment;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -7,8 +7,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomTheme.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomTheme.java
index 78288933..fb9bda02 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomTheme.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomTheme.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomTheme;
+package ml.docilealligator.infinityforreddit.customtheme;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeDao.java
index 68b4de13..0b779316 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomTheme;
+package ml.docilealligator.infinityforreddit.customtheme;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeRepository.java
index 2084bd5b..c3e07f22 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomTheme;
+package ml.docilealligator.infinityforreddit.customtheme;
 
 import androidx.lifecycle.LiveData;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeSettingsItem.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeSettingsItem.java
index 059b575a..56ad8718 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeSettingsItem.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeSettingsItem.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomTheme;
+package ml.docilealligator.infinityforreddit.customtheme;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeViewModel.java
index be8f044d..d7abf17b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomTheme;
+package ml.docilealligator.infinityforreddit.customtheme;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
index d8e53dcf..8621559f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomTheme;
+package ml.docilealligator.infinityforreddit.customtheme;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -7,10 +7,10 @@ import android.graphics.Color;
 import java.util.ArrayList;
 
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
 
-import static ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils.AMOLED;
-import static ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils.DARK;
+import static ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils.AMOLED;
+import static ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils.DARK;
 
 public class CustomThemeWrapper {
     private SharedPreferences lightThemeSharedPreferences;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioBigImageView.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/AspectRatioBigImageView.java
index 43114665..d001faa3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioBigImageView.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/AspectRatioBigImageView.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioGifImageView.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/AspectRatioGifImageView.java
index f77f5bd8..bd735f90 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioGifImageView.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/AspectRatioGifImageView.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioSubsamplingScaleImageView.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/AspectRatioSubsamplingScaleImageView.java
index 9877e697..dffdb9af 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioSubsamplingScaleImageView.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/AspectRatioSubsamplingScaleImageView.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/ColorPickerDialog.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/ColorPickerDialog.java
index ff3f9423..6c6428fe 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/ColorPickerDialog.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/ColorPickerDialog.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.graphics.Color;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/CustomToroContainer.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/CustomToroContainer.java
index 40e3fe3e..3df8b083 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/CustomToroContainer.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/CustomToroContainer.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/LollipopBugFixedWebView.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/LollipopBugFixedWebView.java
index 286aaf4c..6392902d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/LollipopBugFixedWebView.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/LollipopBugFixedWebView.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.content.res.Configuration;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/MarkwonLinearLayoutManager.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/MarkwonLinearLayoutManager.java
index 56f3dddc..a654b437 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/MarkwonLinearLayoutManager.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/MarkwonLinearLayoutManager.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.CustomView;
+package ml.docilealligator.infinityforreddit.customviews;
 
 import android.content.Context;
 import android.view.View;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeAutoplayNsfwVideosEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeAutoplayNsfwVideosEvent.java
index 47af8163..53f35bad 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeAutoplayNsfwVideosEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeAutoplayNsfwVideosEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeAutoplayNsfwVideosEvent {
     public boolean autoplayNsfwVideos;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeCompactLayoutToolbarHiddenByDefaultEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeCompactLayoutToolbarHiddenByDefaultEvent.java
index be9349ba..cb2a3ec2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeCompactLayoutToolbarHiddenByDefaultEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeCompactLayoutToolbarHiddenByDefaultEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeCompactLayoutToolbarHiddenByDefaultEvent {
     public boolean compactLayoutToolbarHiddenByDefault;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeConfirmToExitEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeConfirmToExitEvent.java
index 9371c9ac..fbfc4ae3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeConfirmToExitEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeConfirmToExitEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeConfirmToExitEvent {
     public boolean confirmToExit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDataSavingModeEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDataSavingModeEvent.java
index 2be45caf..3d77ecb5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDataSavingModeEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDataSavingModeEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeDataSavingModeEvent {
     public String dataSavingMode;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDefaultPostLayoutEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDefaultPostLayoutEvent.java
index 2a5819fb..3b60d2e1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDefaultPostLayoutEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDefaultPostLayoutEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeDefaultPostLayoutEvent {
     public int defaultPostLayout;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDisableImagePreviewEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDisableImagePreviewEvent.java
index 85c7122d..d167c7e0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDisableImagePreviewEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDisableImagePreviewEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeDisableImagePreviewEvent {
     public boolean disableImagePreview;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDisableSwipingBetweenTabsEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDisableSwipingBetweenTabsEvent.java
index 371954e8..ad1da23b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeDisableSwipingBetweenTabsEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeDisableSwipingBetweenTabsEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeDisableSwipingBetweenTabsEvent {
     public boolean disableSwipingBetweenTabs;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeEnableSwipeActionSwitchEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeEnableSwipeActionSwitchEvent.java
index 5c67246f..27a33440 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeEnableSwipeActionSwitchEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeEnableSwipeActionSwitchEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeEnableSwipeActionSwitchEvent {
     public boolean enableSwipeAction;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeLockBottomAppBarEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeLockBottomAppBarEvent.java
index 45d483c6..c960c68c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeLockBottomAppBarEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeLockBottomAppBarEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeLockBottomAppBarEvent {
     public boolean lockBottomAppBar;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeLongPressToHideToolbarInCompactLayoutEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeLongPressToHideToolbarInCompactLayoutEvent.java
index 1d1cfcdf..2b14c0bc 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeLongPressToHideToolbarInCompactLayoutEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeLongPressToHideToolbarInCompactLayoutEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeLongPressToHideToolbarInCompactLayoutEvent {
     public boolean longPressToHideToolbarInCompactLayout;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeMuteAutoplayingVideosEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeMuteAutoplayingVideosEvent.java
index 421be2a1..b13681e7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeMuteAutoplayingVideosEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeMuteAutoplayingVideosEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeMuteAutoplayingVideosEvent {
     public boolean muteAutoplayingVideos;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeMuteNSFWVideoEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeMuteNSFWVideoEvent.java
index 92e26562..78d98488 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeMuteNSFWVideoEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeMuteNSFWVideoEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeMuteNSFWVideoEvent {
     public boolean muteNSFWVideo;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeNSFWBlurEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeNSFWBlurEvent.java
index 9bd868b4..cc4f5987 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeNSFWBlurEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeNSFWBlurEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeNSFWBlurEvent {
     public boolean needBlurNSFW;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeNSFWEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeNSFWEvent.java
index ba19f652..f7042086 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeNSFWEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeNSFWEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeNSFWEvent {
     public boolean nsfw;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeNetworkStatusEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeNetworkStatusEvent.java
index 7fe86dee..5d9540e1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeNetworkStatusEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeNetworkStatusEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeNetworkStatusEvent {
     public int connectedNetwork;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangePostLayoutEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangePostLayoutEvent.java
index a02b1373..d414c01a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangePostLayoutEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangePostLayoutEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangePostLayoutEvent {
     public int postLayout;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeRequireAuthToAccountSectionEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeRequireAuthToAccountSectionEvent.java
index d8455db5..a01e89bd 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeRequireAuthToAccountSectionEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeRequireAuthToAccountSectionEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeRequireAuthToAccountSectionEvent {
     public boolean requireAuthToAccountSection;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSavePostFeedScrolledPositionEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSavePostFeedScrolledPositionEvent.java
index 5dd363eb..cc8cfdef 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSavePostFeedScrolledPositionEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSavePostFeedScrolledPositionEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeSavePostFeedScrolledPositionEvent {
     public boolean savePostFeedScrolledPosition;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeShowAbsoluteNumberOfVotesEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeShowAbsoluteNumberOfVotesEvent.java
index c0547c20..1fb29aa4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeShowAbsoluteNumberOfVotesEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeShowAbsoluteNumberOfVotesEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeShowAbsoluteNumberOfVotesEvent {
     public boolean showAbsoluteNumberOfVotes;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeShowElapsedTimeEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeShowElapsedTimeEvent.java
index 2b715833..5e88e78d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeShowElapsedTimeEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeShowElapsedTimeEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeShowElapsedTimeEvent {
     public boolean showElapsedTime;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSpoilerBlurEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSpoilerBlurEvent.java
index 24644b8d..92219f58 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSpoilerBlurEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSpoilerBlurEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeSpoilerBlurEvent {
     public boolean needBlurSpoiler;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeStartAutoplayVisibleAreaOffsetEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeStartAutoplayVisibleAreaOffsetEvent.java
index 34fc48a9..1f4feb1c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeStartAutoplayVisibleAreaOffsetEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeStartAutoplayVisibleAreaOffsetEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeStartAutoplayVisibleAreaOffsetEvent {
     public double startAutoplayVisibleAreaOffset;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSwipeActionEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSwipeActionEvent.java
index fabda6ff..fe3f8ef3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSwipeActionEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSwipeActionEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeSwipeActionEvent {
     public int swipeLeftAction;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSwipeActionThresholdEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSwipeActionThresholdEvent.java
index d040e0fe..355edc59 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeSwipeActionThresholdEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeSwipeActionThresholdEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeSwipeActionThresholdEvent {
     public float swipeActionThreshold;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeTimeFormatEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeTimeFormatEvent.java
index 440e0171..84a35326 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeTimeFormatEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeTimeFormatEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeTimeFormatEvent {
     public String timeFormat;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeVibrateWhenActionTriggeredEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeVibrateWhenActionTriggeredEvent.java
index bef491d6..5c1f9823 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeVibrateWhenActionTriggeredEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeVibrateWhenActionTriggeredEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeVibrateWhenActionTriggeredEvent {
     public boolean vibrateWhenActionTriggered;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeVideoAutoplayEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeVideoAutoplayEvent.java
index 76e7a589..aed729c6 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeVideoAutoplayEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeVideoAutoplayEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeVideoAutoplayEvent {
     public String autoplay;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeVoteButtonsPositionEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeVoteButtonsPositionEvent.java
index 00f506ab..22bb9e9f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ChangeVoteButtonsPositionEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeVoteButtonsPositionEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ChangeVoteButtonsPositionEvent {
     public boolean voteButtonsOnTheRight;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/DownloadMediaEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/DownloadMediaEvent.java
index 174b49ea..6398cf5e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/DownloadMediaEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/DownloadMediaEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class DownloadMediaEvent {
     public boolean isSuccessful;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/DownloadRedditVideoEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/DownloadRedditVideoEvent.java
index 2edb279e..e6b1a9ca 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/DownloadRedditVideoEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/DownloadRedditVideoEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class DownloadRedditVideoEvent {
     public boolean isSuccessful;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/events/GoBackToMainPageEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/GoBackToMainPageEvent.java
new file mode 100644
index 00000000..cff195b3
--- /dev/null
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/GoBackToMainPageEvent.java
@@ -0,0 +1,4 @@
+package ml.docilealligator.infinityforreddit.events;
+
+public class GoBackToMainPageEvent {
+}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/PostUpdateEventToDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/PostUpdateEventToDetailActivity.java
index bb935590..e629ea2b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/PostUpdateEventToDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/PostUpdateEventToDetailActivity.java
@@ -1,6 +1,6 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 
 public class PostUpdateEventToDetailActivity {
     public final Post post;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/PostUpdateEventToPostList.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/PostUpdateEventToPostList.java
index f37ae7bc..96f5e62f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/PostUpdateEventToPostList.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/PostUpdateEventToPostList.java
@@ -1,6 +1,6 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 
 public class PostUpdateEventToPostList {
     public final Post post;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/events/RecreateActivityEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/RecreateActivityEvent.java
new file mode 100644
index 00000000..b7f5c087
--- /dev/null
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/RecreateActivityEvent.java
@@ -0,0 +1,4 @@
+package ml.docilealligator.infinityforreddit.events;
+
+public class RecreateActivityEvent {
+}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/events/RefreshMultiRedditsEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/RefreshMultiRedditsEvent.java
new file mode 100644
index 00000000..60d4295b
--- /dev/null
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/RefreshMultiRedditsEvent.java
@@ -0,0 +1,4 @@
+package ml.docilealligator.infinityforreddit.events;
+
+public class RefreshMultiRedditsEvent {
+}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RepliedToPrivateMessageEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/RepliedToPrivateMessageEvent.java
index 59d82f3c..fc84880c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/RepliedToPrivateMessageEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/RepliedToPrivateMessageEvent.java
@@ -1,6 +1,6 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
-import ml.docilealligator.infinityforreddit.Message.Message;
+import ml.docilealligator.infinityforreddit.message.Message;
 
 public class RepliedToPrivateMessageEvent {
     public Message newReply;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ShowDividerInCompactLayoutPreferenceEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ShowDividerInCompactLayoutPreferenceEvent.java
index eb53c58e..84fba13e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ShowDividerInCompactLayoutPreferenceEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ShowDividerInCompactLayoutPreferenceEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ShowDividerInCompactLayoutPreferenceEvent {
     public boolean showDividerInCompactLayout;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ShowThumbnailOnTheRightInCompactLayoutEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ShowThumbnailOnTheRightInCompactLayoutEvent.java
index f1010773..0f5edd86 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/ShowThumbnailOnTheRightInCompactLayoutEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ShowThumbnailOnTheRightInCompactLayoutEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class ShowThumbnailOnTheRightInCompactLayoutEvent {
     public boolean showThumbnailOnTheRightInCompactLayout;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitCrosspostEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitCrosspostEvent.java
index 55b4a5bd..5c675bcb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitCrosspostEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitCrosspostEvent.java
@@ -1,6 +1,6 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 
 public class SubmitCrosspostEvent {
     public boolean postSuccess;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitImagePostEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitImagePostEvent.java
index 7c0f5064..f98c7744 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitImagePostEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitImagePostEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class SubmitImagePostEvent {
     public boolean postSuccess;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitTextOrLinkPostEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitTextOrLinkPostEvent.java
index 0e164b60..c0613568 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitTextOrLinkPostEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitTextOrLinkPostEvent.java
@@ -1,6 +1,6 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 
 public class SubmitTextOrLinkPostEvent {
     public boolean postSuccess;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitVideoOrGifPostEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitVideoOrGifPostEvent.java
index b6f96dc9..2a5aa0a7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SubmitVideoOrGifPostEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SubmitVideoOrGifPostEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class SubmitVideoOrGifPostEvent {
     public boolean postSuccess;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SwitchAccountEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SwitchAccountEvent.java
index 18f267c2..bd907147 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Event/SwitchAccountEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/SwitchAccountEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Event;
+package ml.docilealligator.infinityforreddit.events;
 
 public class SwitchAccountEvent {
     public String excludeActivityClassName;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontFamily.java
index f24786fa..1445c503 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontFamily.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Font;
+package ml.docilealligator.infinityforreddit.font;
 
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontStyle.java
index 654cff07..5a448852 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontStyle.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontStyle.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Font;
+package ml.docilealligator.infinityforreddit.font;
 
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontFamily.java
index 09198c8f..c04111e5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontFamily.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Font;
+package ml.docilealligator.infinityforreddit.font;
 
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontStyle.java
index 101b17b4..a7e3d7fa 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontStyle.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontStyle.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Font;
+package ml.docilealligator.infinityforreddit.font;
 
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontFamily.java
index eff158d0..60855f54 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontFamily.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Font;
+package ml.docilealligator.infinityforreddit.font;
 
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontStyle.java
index 9ac48525..0c2a7d53 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontStyle.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontStyle.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Font;
+package ml.docilealligator.infinityforreddit.font;
 
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ChangePullToRefreshEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ChangePullToRefreshEvent.java
index ea1d2234..c9aa91b9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ChangePullToRefreshEvent.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ChangePullToRefreshEvent.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 public class ChangePullToRefreshEvent {
     public boolean pullToRefresh;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/CommentsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/CommentsListingFragment.java
index e04b3716..75ed77db 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/CommentsListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/CommentsListingFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 
 import android.app.Activity;
@@ -36,19 +36,19 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Adapter.CommentsListingRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
-import ml.docilealligator.infinityforreddit.Comment.CommentViewModel;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.adapters.CommentsListingRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.asynctasks.GetCurrentAccountAsyncTask;
+import ml.docilealligator.infinityforreddit.comment.CommentViewModel;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Retrofit;
 
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/FollowedUsersListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/FollowedUsersListingFragment.java
index 98b49d2e..a740116c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/FollowedUsersListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/FollowedUsersListingFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 
 import android.app.Activity;
@@ -30,16 +30,16 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubscribedThingListingActivity;
-import ml.docilealligator.infinityforreddit.Adapter.FollowedUsersRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.activities.SubscribedThingListingActivity;
+import ml.docilealligator.infinityforreddit.adapters.FollowedUsersRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/InboxFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/InboxFragment.java
index 56f4c2a0..f23b6597 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/InboxFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/InboxFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -29,14 +29,14 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Adapter.MessageRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RepliedToPrivateMessageEvent;
-import ml.docilealligator.infinityforreddit.Message.FetchMessage;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.adapters.MessageRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RepliedToPrivateMessageEvent;
+import ml.docilealligator.infinityforreddit.message.FetchMessage;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Message.MessageViewModel;
+import ml.docilealligator.infinityforreddit.message.MessageViewModel;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/MultiRedditListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java
index 21bde76a..b9ae3f7b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/MultiRedditListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -28,16 +28,16 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubscribedThingListingActivity;
-import ml.docilealligator.infinityforreddit.Adapter.MultiRedditListingRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.activities.SubscribedThingListingActivity;
+import ml.docilealligator.infinityforreddit.adapters.MultiRedditListingRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditViewModel;
+import ml.docilealligator.infinityforreddit.multireddit.MultiRedditViewModel;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class MultiRedditListingFragment extends Fragment implements FragmentCommunicator {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
index 482ebb21..8ab11086 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 
 import android.content.Context;
@@ -61,53 +61,53 @@ import butterknife.ButterKnife;
 import im.ene.toro.exoplayer.ExoCreator;
 import im.ene.toro.media.PlaybackInfo;
 import im.ene.toro.media.VolumeInfo;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Activity.FilteredThingActivity;
-import ml.docilealligator.infinityforreddit.Activity.MainActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.activities.FilteredThingActivity;
+import ml.docilealligator.infinityforreddit.activities.MainActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
 import ml.docilealligator.infinityforreddit.ActivityToolbarInterface;
-import ml.docilealligator.infinityforreddit.Adapter.PostRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.CustomView.CustomToroContainer;
-import ml.docilealligator.infinityforreddit.Event.ChangeAutoplayNsfwVideosEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeCompactLayoutToolbarHiddenByDefaultEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeDataSavingModeEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeDefaultPostLayoutEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeDisableImagePreviewEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeEnableSwipeActionSwitchEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeLongPressToHideToolbarInCompactLayoutEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeMuteAutoplayingVideosEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeMuteNSFWVideoEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWBlurEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeNetworkStatusEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangePostLayoutEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSavePostFeedScrolledPositionEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeShowAbsoluteNumberOfVotesEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeShowElapsedTimeEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSpoilerBlurEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeStartAutoplayVisibleAreaOffsetEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSwipeActionEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSwipeActionThresholdEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeTimeFormatEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeVibrateWhenActionTriggeredEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeVideoAutoplayEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeVoteButtonsPositionEvent;
-import ml.docilealligator.infinityforreddit.Event.PostUpdateEventToPostList;
-import ml.docilealligator.infinityforreddit.Event.ShowDividerInCompactLayoutPreferenceEvent;
-import ml.docilealligator.infinityforreddit.Event.ShowThumbnailOnTheRightInCompactLayoutEvent;
+import ml.docilealligator.infinityforreddit.adapters.PostRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.customviews.CustomToroContainer;
+import ml.docilealligator.infinityforreddit.events.ChangeAutoplayNsfwVideosEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeCompactLayoutToolbarHiddenByDefaultEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDataSavingModeEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDefaultPostLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDisableImagePreviewEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeEnableSwipeActionSwitchEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeMuteAutoplayingVideosEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeMuteNSFWVideoEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWBlurEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNetworkStatusEvent;
+import ml.docilealligator.infinityforreddit.events.ChangePostLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSavePostFeedScrolledPositionEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeShowAbsoluteNumberOfVotesEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeShowElapsedTimeEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSpoilerBlurEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeStartAutoplayVisibleAreaOffsetEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSwipeActionEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSwipeActionThresholdEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeTimeFormatEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeVibrateWhenActionTriggeredEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeVideoAutoplayEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeVoteButtonsPositionEvent;
+import ml.docilealligator.infinityforreddit.events.PostUpdateEventToPostList;
+import ml.docilealligator.infinityforreddit.events.ShowDividerInCompactLayoutPreferenceEvent;
+import ml.docilealligator.infinityforreddit.events.ShowThumbnailOnTheRightInCompactLayoutEvent;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.NetworkState;
-import ml.docilealligator.infinityforreddit.Post.Post;
-import ml.docilealligator.infinityforreddit.Post.PostDataSource;
-import ml.docilealligator.infinityforreddit.Post.PostViewModel;
+import ml.docilealligator.infinityforreddit.post.Post;
+import ml.docilealligator.infinityforreddit.post.PostDataSource;
+import ml.docilealligator.infinityforreddit.post.PostViewModel;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.SubredditFilter.FetchSubredditFilters;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.subredditfilter.FetchSubredditFilters;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Retrofit;
 
 import static im.ene.toro.media.PlaybackInfo.INDEX_UNSET;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SidebarFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SidebarFragment.java
index bc45fa84..50a7a912 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SidebarFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SidebarFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -38,16 +38,16 @@ import io.noties.markwon.recycler.MarkwonAdapter;
 import io.noties.markwon.recycler.table.TableEntry;
 import io.noties.markwon.recycler.table.TableEntryPlugin;
 import io.noties.markwon.simple.ext.SimpleExtPlugin;
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertSubredditDataAsyncTask;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertSubredditDataAsyncTask;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Subreddit.FetchSubredditData;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditData;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditViewModel;
+import ml.docilealligator.infinityforreddit.subreddit.FetchSubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditData;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditViewModel;
 import retrofit2.Retrofit;
 
 public class SidebarFragment extends Fragment {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubredditListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SubredditListingFragment.java
index 61bff945..14bfbf0a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubredditListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SubredditListingFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 
 import android.app.Activity;
@@ -30,19 +30,19 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Activity.SearchSubredditsResultActivity;
-import ml.docilealligator.infinityforreddit.Activity.ViewSubredditDetailActivity;
-import ml.docilealligator.infinityforreddit.Adapter.SubredditListingRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.activities.SearchSubredditsResultActivity;
+import ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity;
+import ml.docilealligator.infinityforreddit.adapters.SubredditListingRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.Subreddit.SubredditListingViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subreddit.SubredditListingViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubscribedSubredditsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SubscribedSubredditsListingFragment.java
index 63d6aade..6279bae5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubscribedSubredditsListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SubscribedSubredditsListingFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 
 import android.app.Activity;
@@ -30,17 +30,17 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubredditSelectionActivity;
-import ml.docilealligator.infinityforreddit.Activity.SubscribedThingListingActivity;
-import ml.docilealligator.infinityforreddit.Adapter.SubscribedSubredditsRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.activities.SubredditSelectionActivity;
+import ml.docilealligator.infinityforreddit.activities.SubscribedThingListingActivity;
+import ml.docilealligator.infinityforreddit.adapters.SubscribedSubredditsRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewCommentsFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ThemePreviewCommentsFragment.java
index 64903859..9b5dad16 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewCommentsFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ThemePreviewCommentsFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -14,8 +14,8 @@ import androidx.fragment.app.Fragment;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.CustomThemePreviewActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.activities.CustomThemePreviewActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewPostsFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ThemePreviewPostsFragment.java
index 9f041f27..1f56b086 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewPostsFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ThemePreviewPostsFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -24,9 +24,9 @@ import com.libRG.CustomTextView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import ml.docilealligator.infinityforreddit.Activity.CustomThemePreviewActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
-import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView;
+import ml.docilealligator.infinityforreddit.activities.CustomThemePreviewActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/UserListingFragment.java
index d39f0d0e..6d833f4e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/UserListingFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 
 import android.app.Activity;
@@ -29,17 +29,17 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.BaseActivity;
-import ml.docilealligator.infinityforreddit.Adapter.UserListingRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.activities.BaseActivity;
+import ml.docilealligator.infinityforreddit.adapters.UserListingRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.FragmentCommunicator;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.User.UserListingViewModel;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.user.UserListingViewModel;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurImageFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurImageFragment.java
index 29101dd6..66d63fa8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurImageFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurImageFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.Manifest;
 import android.content.Context;
@@ -40,13 +40,13 @@ import java.io.File;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.ViewImgurMediaActivity;
-import ml.docilealligator.infinityforreddit.AsyncTask.SaveBitmapImageToFileAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SetAsWallpaperBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.activities.ViewImgurMediaActivity;
+import ml.docilealligator.infinityforreddit.asynctasks.SaveBitmapImageToFileAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SetAsWallpaperBottomSheetFragment;
 import ml.docilealligator.infinityforreddit.BuildConfig;
 import ml.docilealligator.infinityforreddit.ImgurMedia;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
 import ml.docilealligator.infinityforreddit.SetAsWallpaperCallback;
 
 public class ViewImgurImageFragment extends Fragment {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurVideoFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurVideoFragment.java
index 154901bb..e95306bb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurVideoFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurVideoFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.Manifest;
 import android.app.Activity;
@@ -48,8 +48,8 @@ import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.ImgurMedia;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class ViewImgurVideoFragment extends Fragment {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewRedditGalleryImageOrGifFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java
index 288f0d69..7c03154e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewRedditGalleryImageOrGifFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.Manifest;
 import android.content.Context;
@@ -45,14 +45,14 @@ import java.io.File;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Activity.ViewRedditGalleryActivity;
-import ml.docilealligator.infinityforreddit.AsyncTask.SaveBitmapImageToFileAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.SaveGIFToFileAsyncTask;
-import ml.docilealligator.infinityforreddit.BottomSheetFragment.SetAsWallpaperBottomSheetFragment;
+import ml.docilealligator.infinityforreddit.activities.ViewRedditGalleryActivity;
+import ml.docilealligator.infinityforreddit.asynctasks.SaveBitmapImageToFileAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.SaveGIFToFileAsyncTask;
+import ml.docilealligator.infinityforreddit.bottomsheetfragments.SetAsWallpaperBottomSheetFragment;
 import ml.docilealligator.infinityforreddit.BuildConfig;
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
 import ml.docilealligator.infinityforreddit.SetAsWallpaperCallback;
 
 public class ViewRedditGalleryImageOrGifFragment extends Fragment {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewRedditGalleryVideoFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
index 3ec55cb7..e2d16f22 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewRedditGalleryVideoFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Fragment;
+package ml.docilealligator.infinityforreddit.fragments;
 
 import android.Manifest;
 import android.app.Activity;
@@ -46,10 +46,10 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Post.Post;
+import ml.docilealligator.infinityforreddit.post.Post;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Service.DownloadMediaService;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class ViewRedditGalleryVideoFragment extends Fragment {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ComposeMessage.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ComposeMessage.java
index ff40ccc8..5411d96e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ComposeMessage.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ComposeMessage.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 
@@ -6,8 +6,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/FetchMessage.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/FetchMessage.java
index 1322d7c0..78689fd6 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/FetchMessage.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/FetchMessage.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -6,8 +6,8 @@ import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/Message.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/Message.java
index 771d675e..eb3524c9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/Message.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/Message.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/MessageDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/MessageDataSource.java
index e3f8cc18..37a55509 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/MessageDataSource.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/MessageDataSource.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/MessageDataSourceFactory.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/MessageDataSourceFactory.java
index db717ce5..f7baf668 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/MessageDataSourceFactory.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/MessageDataSourceFactory.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/MessageViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/MessageViewModel.java
index 3af6b708..27833e82 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/MessageViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/MessageViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ParseMessage.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ParseMessage.java
index 410d1886..5ffe40a8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ParseMessage.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ParseMessage.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import android.os.AsyncTask;
 
@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class ParseMessage {
     public static void parseMessage(String response, Locale locale, int messageType,
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ReadMessage.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ReadMessage.java
index bb8b4030..1473a729 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ReadMessage.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ReadMessage.java
@@ -1,12 +1,12 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ReplyMessage.java b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ReplyMessage.java
index ca8edcd2..acdfbfca 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Message/ReplyMessage.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/message/ReplyMessage.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Message;
+package ml.docilealligator.infinityforreddit.message;
 
 import androidx.annotation.NonNull;
 
@@ -6,8 +6,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/CreateMultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/CreateMultiReddit.java
index 67d11d57..186d8574 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/CreateMultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/CreateMultiReddit.java
@@ -1,13 +1,13 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/DeleteMultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/DeleteMultiReddit.java
index 39f9f253..0d6567a1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/DeleteMultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/DeleteMultiReddit.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.annotation.NonNull;
 
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteMultiredditInDatabaseAsyncTask;
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteMultiredditInDatabaseAsyncTask;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/EditMultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/EditMultiReddit.java
index 8f16398b..36303b90 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/EditMultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/EditMultiReddit.java
@@ -1,12 +1,12 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/FavoriteMultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/FavoriteMultiReddit.java
index 8c976245..5d6c7573 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/FavoriteMultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/FavoriteMultiReddit.java
@@ -1,14 +1,14 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.AsyncTask.InsertMultiRedditAsyncTask;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.asynctasks.InsertMultiRedditAsyncTask;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/FetchMultiRedditInfo.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/FetchMultiRedditInfo.java
index 839f69f8..97d2a2d1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/FetchMultiRedditInfo.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/FetchMultiRedditInfo.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import android.os.AsyncTask;
 
@@ -10,9 +10,9 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/FetchMyMultiReddits.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/FetchMyMultiReddits.java
index 383c8f23..7954d0e2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/FetchMyMultiReddits.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/FetchMyMultiReddits.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiReddit.java
index 71b14ad7..b010f9d2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiReddit.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -11,7 +11,7 @@ import androidx.room.Ignore;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
+import ml.docilealligator.infinityforreddit.account.Account;
 
 @Entity(tableName = "multi_reddits", primaryKeys = {"path", "username"},
         foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditDao.java
index 7d3654c8..cb50cba6 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditJSONModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditJSONModel.java
index 665a9092..60f405ef 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditJSONModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditJSONModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import com.google.gson.Gson;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditRepository.java
index 860cdd43..8b8156ae 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import androidx.lifecycle.LiveData;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditViewModel.java
index 14f42bee..989b4853 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/MultiRedditViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/ParseMultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/ParseMultiReddit.java
index 635a9646..d3d23445 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/ParseMultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/ParseMultiReddit.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 import android.os.AsyncTask;
 
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 
 public class ParseMultiReddit {
     interface ParseMultiRedditsListListener {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/SubredditInMultiReddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/SubredditInMultiReddit.java
index 34a1e638..21f734bb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/SubredditInMultiReddit.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/multireddit/SubredditInMultiReddit.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.MultiReddit;
+package ml.docilealligator.infinityforreddit.multireddit;
 
 public class SubredditInMultiReddit {
     String name;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/FetchPost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchPost.java
index 2d5ec30e..bdb3b17e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/FetchPost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchPost.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import androidx.annotation.NonNull;
 
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/FetchRemovedPost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchRemovedPost.java
index dd641e6e..8ae15029 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/FetchRemovedPost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchRemovedPost.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -11,9 +11,9 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.PushshiftAPI;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.apis.PushshiftAPI;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/HidePost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/HidePost.java
index c71fd5a1..fb490c0c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/HidePost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/HidePost.java
@@ -1,12 +1,12 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/ParsePost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
index 64c1ad98..708f4e75 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/ParsePost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -12,10 +12,10 @@ import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 
-import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.fragments.PostFragment;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 /**
  * Created by alex on 3/21/18.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/Post.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java
index 381f89c2..1e220487 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/Post.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 
 /**
  * Created by alex on 3/1/18.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/PostDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/PostDataSource.java
index 480e96b1..e1e50733 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/PostDataSource.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/PostDataSource.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.content.SharedPreferences;
 
@@ -11,12 +11,12 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/PostDataSourceFactory.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/PostDataSourceFactory.java
index 02bc58c3..5973e009 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/PostDataSourceFactory.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/PostDataSourceFactory.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.content.SharedPreferences;
 
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Locale;
 
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
 import retrofit2.Retrofit;
 
 class PostDataSourceFactory extends DataSource.Factory {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/PostViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/PostViewModel.java
index 44496d04..114c68ee 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/PostViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/PostViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.content.SharedPreferences;
 
@@ -18,7 +18,7 @@ import java.util.Locale;
 
 import ml.docilealligator.infinityforreddit.NetworkState;
 import ml.docilealligator.infinityforreddit.SortType;
-import ml.docilealligator.infinityforreddit.SubredditFilter.SubredditFilter;
+import ml.docilealligator.infinityforreddit.subredditfilter.SubredditFilter;
 import retrofit2.Retrofit;
 
 public class PostViewModel extends ViewModel {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/SubmitPost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/SubmitPost.java
index 0abd88e9..14216298 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Post/SubmitPost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/SubmitPost.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Post;
+package ml.docilealligator.infinityforreddit.post;
 
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
@@ -21,10 +21,10 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.Flair;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/DeleteRecentSearchQuery.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/DeleteRecentSearchQuery.java
index f4ada66c..e40703c2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/DeleteRecentSearchQuery.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/DeleteRecentSearchQuery.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.RecentSearchQuery;
+package ml.docilealligator.infinityforreddit.recentsearchquery;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/InsertRecentSearchQuery.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/InsertRecentSearchQuery.java
index 19278a70..e03a6e70 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/InsertRecentSearchQuery.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/InsertRecentSearchQuery.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.RecentSearchQuery;
+package ml.docilealligator.infinityforreddit.recentsearchquery;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQuery.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQuery.java
index 70c9ed5a..7cbbe77a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQuery.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQuery.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.RecentSearchQuery;
+package ml.docilealligator.infinityforreddit.recentsearchquery;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
+import ml.docilealligator.infinityforreddit.account.Account;
 
 @Entity(tableName = "recent_search_queries", primaryKeys = {"username", "search_query"},
         foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQueryDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryDao.java
index 5db9718e..162b02f7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQueryDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.RecentSearchQuery;
+package ml.docilealligator.infinityforreddit.recentsearchquery;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQueryRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryRepository.java
index 259ba28d..5c4e06d8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQueryRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.RecentSearchQuery;
+package ml.docilealligator.infinityforreddit.recentsearchquery;
 
 import androidx.lifecycle.LiveData;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQueryViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryViewModel.java
index 9b792117..aba1b343 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RecentSearchQuery/RecentSearchQueryViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.RecentSearchQuery;
+package ml.docilealligator.infinityforreddit.recentsearchquery;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadMediaService.java b/app/src/main/java/ml/docilealligator/infinityforreddit/services/DownloadMediaService.java
index 49182903..2f2eef38 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadMediaService.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/services/DownloadMediaService.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Service;
+package ml.docilealligator.infinityforreddit.services;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -33,14 +33,14 @@ import java.io.OutputStream;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.API.DownloadFile;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.apis.DownloadFile;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.DownloadProgressResponseBody;
-import ml.docilealligator.infinityforreddit.Event.DownloadMediaEvent;
+import ml.docilealligator.infinityforreddit.events.DownloadMediaEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.NotificationUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.NotificationUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadRedditVideoService.java b/app/src/main/java/ml/docilealligator/infinityforreddit/services/DownloadRedditVideoService.java
index 28133592..c68be79b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadRedditVideoService.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/services/DownloadRedditVideoService.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Service;
+package ml.docilealligator.infinityforreddit.services;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -39,14 +39,14 @@ import java.nio.ByteBuffer;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.API.DownloadFile;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.apis.DownloadFile;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.DownloadProgressResponseBody;
-import ml.docilealligator.infinityforreddit.Event.DownloadRedditVideoEvent;
+import ml.docilealligator.infinityforreddit.events.DownloadRedditVideoEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.NotificationUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.NotificationUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/SubmitPostService.java b/app/src/main/java/ml/docilealligator/infinityforreddit/services/SubmitPostService.java
index 9f539d65..b979a07e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/SubmitPostService.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/services/SubmitPostService.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Service;
+package ml.docilealligator.infinityforreddit.services;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -33,18 +33,18 @@ import java.io.OutputStream;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.SubmitCrosspostEvent;
-import ml.docilealligator.infinityforreddit.Event.SubmitImagePostEvent;
-import ml.docilealligator.infinityforreddit.Event.SubmitTextOrLinkPostEvent;
-import ml.docilealligator.infinityforreddit.Event.SubmitVideoOrGifPostEvent;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.SubmitCrosspostEvent;
+import ml.docilealligator.infinityforreddit.events.SubmitImagePostEvent;
+import ml.docilealligator.infinityforreddit.events.SubmitTextOrLinkPostEvent;
+import ml.docilealligator.infinityforreddit.events.SubmitVideoOrGifPostEvent;
 import ml.docilealligator.infinityforreddit.Flair;
 import ml.docilealligator.infinityforreddit.Infinity;
-import ml.docilealligator.infinityforreddit.Utils.NotificationUtils;
-import ml.docilealligator.infinityforreddit.Post.Post;
-import ml.docilealligator.infinityforreddit.Post.SubmitPost;
+import ml.docilealligator.infinityforreddit.utils.NotificationUtils;
+import ml.docilealligator.infinityforreddit.post.Post;
+import ml.docilealligator.infinityforreddit.post.SubmitPost;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Retrofit;
 
 public class SubmitPostService extends Service {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AboutPreferenceFragment.java
index 640c8398..8e30fc11 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AboutPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.app.Activity;
@@ -13,10 +13,10 @@ import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
 import ml.docilealligator.infinityforreddit.BuildConfig;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 /**
  * A simple {@link PreferenceFragmentCompat} subclass.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/Acknowledgement.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/Acknowledgement.java
index f3466268..d11f368f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/Acknowledgement.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/Acknowledgement.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.net.Uri;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AcknowledgementFragment.java
index feb13e66..4864d4cb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AcknowledgementFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.app.Activity;
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.AcknowledgementRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.adapters.AcknowledgementRecyclerViewAdapter;
 import ml.docilealligator.infinityforreddit.R;
 
 /**
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AdvancedPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AdvancedPreferenceFragment.java
index ff794aa5..4c3e602e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AdvancedPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AdvancedPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,16 +19,16 @@ import org.greenrobot.eventbus.EventBus;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteAllPostLayoutsAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteAllSortTypesAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteAllSubredditsAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteAllThemesAsyncTask;
-import ml.docilealligator.infinityforreddit.AsyncTask.DeleteAllUsersAsyncTask;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteAllPostLayoutsAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteAllSortTypesAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteAllSubredditsAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteAllThemesAsyncTask;
+import ml.docilealligator.infinityforreddit.asynctasks.DeleteAllUsersAsyncTask;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CreditsPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CreditsPreferenceFragment.java
index dc33348b..5c62f438 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CreditsPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CreditsPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.app.Activity;
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import ml.docilealligator.infinityforreddit.Activity.LinkResolverActivity;
+import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 /**
  * A simple {@link PreferenceFragmentCompat} subclass.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CustomizeBottomAppBarFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java
index 6e4bc2a1..a025cccc 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CustomizeBottomAppBarFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -23,7 +23,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class CustomizeBottomAppBarFragment extends Fragment {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CustomizeMainPageTabsFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeMainPageTabsFragment.java
index 979c2728..7a2cca00 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CustomizeMainPageTabsFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeMainPageTabsFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -25,7 +25,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class CustomizeMainPageTabsFragment extends Fragment {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/DataSavingModePreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/DataSavingModePreferenceFragment.java
index caded180..652e737f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/DataSavingModePreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/DataSavingModePreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.os.Bundle;
 
@@ -8,10 +8,10 @@ import androidx.preference.SwitchPreference;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeDataSavingModeEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeDisableImagePreviewEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDataSavingModeEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDisableImagePreviewEvent;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class DataSavingModePreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/DownloadLocationPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/DownloadLocationPreferenceFragment.java
index 61163598..633cd581 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/DownloadLocationPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/DownloadLocationPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -16,7 +16,7 @@ import javax.inject.Named;
 
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static android.content.Intent.ACTION_OPEN_DOCUMENT_TREE;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FilterPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/FilterPreferenceFragment.java
index a0555d5d..91f40c98 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FilterPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/FilterPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,9 +9,9 @@ import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import ml.docilealligator.infinityforreddit.Activity.SubredditFilterPopularAndAllActivity;
+import ml.docilealligator.infinityforreddit.activities.SubredditFilterPopularAndAllActivity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class FilterPreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/FontPreferenceFragment.java
index 78ae7d82..2d608ca5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/FontPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,9 +10,9 @@ import androidx.preference.PreferenceFragmentCompat;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class FontPreferenceFragment extends PreferenceFragmentCompat {
     private Activity activity;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreviewFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/FontPreviewFragment.java
index 9cd93e01..ef4b96eb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreviewFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/FontPreviewFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/GesturesAndButtonsPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/GesturesAndButtonsPreferenceFragment.java
index 3c1bde13..cd151ad3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/GesturesAndButtonsPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/GesturesAndButtonsPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.app.Activity;
@@ -17,11 +17,11 @@ import org.greenrobot.eventbus.EventBus;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeLockBottomAppBarEvent;
-import ml.docilealligator.infinityforreddit.Fragment.ChangePullToRefreshEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeLockBottomAppBarEvent;
+import ml.docilealligator.infinityforreddit.fragments.ChangePullToRefreshEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/ImmersiveInterfacePreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/ImmersiveInterfacePreferenceFragment.java
index 019f3593..785721cb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/ImmersiveInterfacePreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/ImmersiveInterfacePreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.os.Bundle;
 
@@ -7,9 +7,9 @@ import androidx.preference.SwitchPreference;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class ImmersiveInterfacePreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/InterfacePreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/InterfacePreferenceFragment.java
index 29f33fc8..e873f8ba 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/InterfacePreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/InterfacePreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.os.Build;
@@ -11,16 +11,16 @@ import androidx.preference.SwitchPreference;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeCompactLayoutToolbarHiddenByDefaultEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeDefaultPostLayoutEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeLongPressToHideToolbarInCompactLayoutEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeShowAbsoluteNumberOfVotesEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeVoteButtonsPositionEvent;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
-import ml.docilealligator.infinityforreddit.Event.ShowDividerInCompactLayoutPreferenceEvent;
-import ml.docilealligator.infinityforreddit.Event.ShowThumbnailOnTheRightInCompactLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeCompactLayoutToolbarHiddenByDefaultEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDefaultPostLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeShowAbsoluteNumberOfVotesEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeVoteButtonsPositionEvent;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.events.ShowDividerInCompactLayoutPreferenceEvent;
+import ml.docilealligator.infinityforreddit.events.ShowThumbnailOnTheRightInCompactLayoutEvent;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class InterfacePreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/MainPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/MainPreferenceFragment.java
index 32aec40d..e9adbe8b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/MainPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/MainPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.content.Context;
@@ -16,7 +16,7 @@ import javax.inject.Named;
 
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
 import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/MiscellaneousPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/MiscellaneousPreferenceFragment.java
index 1b8c69d9..c27e7eec 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/MiscellaneousPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/MiscellaneousPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -15,11 +15,11 @@ import org.greenrobot.eventbus.EventBus;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeSavePostFeedScrolledPositionEvent;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSavePostFeedScrolledPositionEvent;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class MiscellaneousPreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NotificationPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NotificationPreferenceFragment.java
index 141e4ea4..cf014c49 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NotificationPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NotificationPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 
 import android.app.Activity;
@@ -25,7 +25,7 @@ import javax.inject.Named;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.PullNotificationWorker;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NsfwAndBlurringFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NsfwAndBlurringFragment.java
index 470d10d5..a4373a70 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NsfwAndBlurringFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NsfwAndBlurringFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -22,12 +22,12 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWBlurEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeNSFWEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSpoilerBlurEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWBlurEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSpoilerBlurEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class NsfwAndBlurringFragment extends Fragment {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NumberOfColumnsInPostFeedPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NumberOfColumnsInPostFeedPreferenceFragment.java
index 04052e07..dfb991dd 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NumberOfColumnsInPostFeedPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NumberOfColumnsInPostFeedPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/SecurityPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/SecurityPreferenceFragment.java
index 9ee09d5c..cb6917c8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/SecurityPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/SecurityPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -18,10 +18,10 @@ import java.util.concurrent.Executor;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeRequireAuthToAccountSectionEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeRequireAuthToAccountSectionEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
 import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/SwipeActionPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/SwipeActionPreferenceFragment.java
index 4fe474ec..de7860b5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/SwipeActionPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/SwipeActionPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.os.Bundle;
 
@@ -8,13 +8,13 @@ import androidx.preference.SwitchPreference;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeDisableSwipingBetweenTabsEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeEnableSwipeActionSwitchEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSwipeActionEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeSwipeActionThresholdEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeVibrateWhenActionTriggeredEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeDisableSwipingBetweenTabsEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeEnableSwipeActionSwitchEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSwipeActionEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeSwipeActionThresholdEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeVibrateWhenActionTriggeredEvent;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class SwipeActionPreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/ThemePreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/ThemePreferenceFragment.java
index 01c55179..e28cd52f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/ThemePreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/ThemePreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.content.Context;
 import android.content.Intent;
@@ -20,16 +20,16 @@ import org.greenrobot.eventbus.EventBus;
 
 import javax.inject.Inject;
 
-import ml.docilealligator.infinityforreddit.Activity.CustomThemeListingActivity;
-import ml.docilealligator.infinityforreddit.Activity.CustomizeThemeActivity;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeViewModel;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent;
+import ml.docilealligator.infinityforreddit.activities.CustomThemeListingActivity;
+import ml.docilealligator.infinityforreddit.activities.CustomizeThemeActivity;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeViewModel;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/TimeFormatPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/TimeFormatPreferenceFragment.java
index f0adfe12..42ced176 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/TimeFormatPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/TimeFormatPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.os.Bundle;
 
@@ -8,10 +8,10 @@ import androidx.preference.SwitchPreference;
 
 import org.greenrobot.eventbus.EventBus;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeShowElapsedTimeEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeTimeFormatEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeShowElapsedTimeEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeTimeFormatEvent;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class TimeFormatPreferenceFragment extends PreferenceFragmentCompat {
     @Override
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/Translation.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/Translation.java
index 80968ae4..d01c59b0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/Translation.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/Translation.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/TranslationFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/TranslationFragment.java
index 44ad57e8..a0f9cd1e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/TranslationFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/TranslationFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -16,8 +16,8 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import ml.docilealligator.infinityforreddit.Adapter.TranslationFragmentRecyclerViewAdapter;
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.adapters.TranslationFragmentRecyclerViewAdapter;
+import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/VideoPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/VideoPreferenceFragment.java
index aa8bc2dd..f7941534 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/VideoPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/VideoPreferenceFragment.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Settings;
+package ml.docilealligator.infinityforreddit.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,14 +19,14 @@ import org.greenrobot.eventbus.EventBus;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import ml.docilealligator.infinityforreddit.Event.ChangeAutoplayNsfwVideosEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeMuteAutoplayingVideosEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeMuteNSFWVideoEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeStartAutoplayVisibleAreaOffsetEvent;
-import ml.docilealligator.infinityforreddit.Event.ChangeVideoAutoplayEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeAutoplayNsfwVideosEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeMuteAutoplayingVideosEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeMuteNSFWVideoEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeStartAutoplayVisibleAreaOffsetEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeVideoAutoplayEvent;
 import ml.docilealligator.infinityforreddit.Infinity;
 import ml.docilealligator.infinityforreddit.R;
-import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 
 public class VideoPreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/FetchSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/FetchSubredditData.java
index f75ed256..a7a9eb21 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/FetchSubredditData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/FetchSubredditData.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import androidx.annotation.NonNull;
 
@@ -7,8 +7,8 @@ import com.facebook.common.internal.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/ParseSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/ParseSubredditData.java
index 1a4bcb74..d673647d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/ParseSubredditData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/ParseSubredditData.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import android.os.AsyncTask;
 
@@ -10,8 +10,8 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.Utils.Utils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.Utils;
 
 class ParseSubredditData {
     static void parseSubredditData(String response, ParseSubredditDataListener parseSubredditDataListener) {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditDao.java
index d6b07312..1ae2a1e0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditData.java
index f05e5912..21d5d130 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditData.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditListingDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingDataSource.java
index b260c985..3757cde9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditListingDataSource.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingDataSource.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditListingDataSourceFactory.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingDataSourceFactory.java
index 22e57d26..0252b2a0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditListingDataSourceFactory.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingDataSourceFactory.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditListingViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingViewModel.java
index 80c1f4b9..a559aee2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditListingViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditRepository.java
index 66817e40..649b4ee0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditSubscription.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditSubscription.java
index 5475e319..52664234 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditSubscription.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditSubscription.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import android.os.AsyncTask;
 
@@ -7,10 +7,10 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditViewModel.java
index 46829c3b..debbbf36 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditWithSelection.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditWithSelection.java
index a8cd289f..68eddfa1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Subreddit/SubredditWithSelection.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditWithSelection.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Subreddit;
+package ml.docilealligator.infinityforreddit.subreddit;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-import ml.docilealligator.infinityforreddit.SubscribedSubreddit.SubscribedSubredditData;
+import ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData;
 
 public class SubredditWithSelection implements Parcelable {
     private String name;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/DeleteSubredditFilter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/DeleteSubredditFilter.java
index 63b856dc..051d247a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/DeleteSubredditFilter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/DeleteSubredditFilter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubredditFilter;
+package ml.docilealligator.infinityforreddit.subredditfilter;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/FetchSubredditFilters.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/FetchSubredditFilters.java
index 74864fc7..e9c6f406 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/FetchSubredditFilters.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/FetchSubredditFilters.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubredditFilter;
+package ml.docilealligator.infinityforreddit.subredditfilter;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/InsertSubredditFilter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/InsertSubredditFilter.java
index b91fa1e2..eb26a964 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/InsertSubredditFilter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/InsertSubredditFilter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubredditFilter;
+package ml.docilealligator.infinityforreddit.subredditfilter;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/SubredditFilter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/SubredditFilter.java
index ddfa01f0..337ebab4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/SubredditFilter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/SubredditFilter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubredditFilter;
+package ml.docilealligator.infinityforreddit.subredditfilter;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/SubredditFilterDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/SubredditFilterDao.java
index fb5d3829..1cdcd22b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/SubredditFilterDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/SubredditFilterDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubredditFilter;
+package ml.docilealligator.infinityforreddit.subredditfilter;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/SubredditFilterViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/SubredditFilterViewModel.java
index 557e879d..9f571f30 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditFilter/SubredditFilterViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subredditfilter/SubredditFilterViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubredditFilter;
+package ml.docilealligator.infinityforreddit.subredditfilter;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditDao.java
index 225c4cb4..f7452100 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubscribedSubreddit;
+package ml.docilealligator.infinityforreddit.subscribedsubreddit;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditData.java
index 167e6423..a5c42381 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditData.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.SubscribedSubreddit;
+package ml.docilealligator.infinityforreddit.subscribedsubreddit;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
+import ml.docilealligator.infinityforreddit.account.Account;
 
 @Entity(tableName = "subscribed_subreddits", primaryKeys = {"id", "username"},
         foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditRepository.java
index aa5fbc0f..053ae1ed 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubscribedSubreddit;
+package ml.docilealligator.infinityforreddit.subscribedsubreddit;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditViewModel.java
index 79e3dd2b..fa38fcac 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubreddit/SubscribedSubredditViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribedsubreddit/SubscribedSubredditViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubscribedSubreddit;
+package ml.docilealligator.infinityforreddit.subscribedsubreddit;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserDao.java
index 66660b8c..9ae7c895 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
+package ml.docilealligator.infinityforreddit.subscribeduser;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserData.java
index 6c7bb7e7..0f9c0059 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserData.java
@@ -1,11 +1,11 @@
-package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
+package ml.docilealligator.infinityforreddit.subscribeduser;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
 
-import ml.docilealligator.infinityforreddit.Account.Account;
+import ml.docilealligator.infinityforreddit.account.Account;
 
 @Entity(tableName = "subscribed_users", primaryKeys = {"name", "username"},
         foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserRepository.java
index f5a1c1ab..1bd0aa71 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
+package ml.docilealligator.infinityforreddit.subscribeduser;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserViewModel.java
index 9f1b033f..b19e5906 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/subscribeduser/SubscribedUserViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
+package ml.docilealligator.infinityforreddit.subscribeduser;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/BlockUser.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/BlockUser.java
index ca6dd1d1..c7a7207e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/BlockUser.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/BlockUser.java
@@ -1,12 +1,12 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/FetchUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/FetchUserData.java
index f214bec1..60b20f55 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/FetchUserData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/FetchUserData.java
@@ -1,10 +1,10 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/ParseUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/ParseUserData.java
index e640d7e3..bc0f1966 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/ParseUserData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/ParseUserData.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import android.os.AsyncTask;
 
@@ -8,7 +8,7 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import ml.docilealligator.infinityforreddit.Utils.JSONUtils;
+import ml.docilealligator.infinityforreddit.utils.JSONUtils;
 
 public class ParseUserData {
     static void parseUserData(String response, ParseUserDataListener parseUserDataListener) {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserDao.java
index b7221c26..77b12821 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserDao.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserDao.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserData.java
index 2e4243c7..69b93740 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserData.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserFollowing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserFollowing.java
index d49acf25..170ec7ed 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserFollowing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserFollowing.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import android.os.AsyncTask;
 
@@ -7,10 +7,10 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import ml.docilealligator.infinityforreddit.API.RedditAPI;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
-import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
-import ml.docilealligator.infinityforreddit.Utils.APIUtils;
+import ml.docilealligator.infinityforreddit.apis.RedditAPI;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserDao;
+import ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData;
+import ml.docilealligator.infinityforreddit.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserListingDataSource.java
index fc6b1f60..614a0303 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingDataSource.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserListingDataSource.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingDataSourceFactory.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserListingDataSourceFactory.java
index ee0a49c0..c764cec6 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingDataSourceFactory.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserListingDataSourceFactory.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserListingViewModel.java
index f2816f3c..054e3dfb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserListingViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserRepository.java
index af0b5bb4..8d8101a3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserRepository.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserRepository.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import android.os.AsyncTask;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserViewModel.java
index 93f185ae..0857a42a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserViewModel.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/user/UserViewModel.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.User;
+package ml.docilealligator.infinityforreddit.user;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/APIUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java
index a8be1ebd..ae1b767c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/APIUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 import android.util.Base64;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/CustomThemeSharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/CustomThemeSharedPreferencesUtils.java
index 98998ab5..0f3e991c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/CustomThemeSharedPreferencesUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/CustomThemeSharedPreferencesUtils.java
@@ -1,8 +1,8 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 import android.content.SharedPreferences;
 
-import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme;
+import ml.docilealligator.infinityforreddit.customtheme.CustomTheme;
 
 public class CustomThemeSharedPreferencesUtils {
     public static final int LIGHT = 0;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GetPathUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/GetPathUtils.java
index 1ccb6b47..2424b167 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GetPathUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/GetPathUtils.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 import android.annotation.TargetApi;
 import android.content.ContentUris;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/GlideImageGetter.java
index 00f940a0..ee729d96 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/GlideImageGetter.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/JSONUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/JSONUtils.java
index 2b1ff97b..7832d74c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/JSONUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/JSONUtils.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 /**
  * Created by alex on 2/25/18.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/NotificationUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/NotificationUtils.java
index 1d5a3f6f..940838af 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/NotificationUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/NotificationUtils.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
index 6b441e27..ebfa20fe 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 /**
  * Created by alex on 2/23/18.
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/Utils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java
index d277e8df..8d51256d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/Utils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java
@@ -1,4 +1,4 @@
-package ml.docilealligator.infinityforreddit.Utils;
+package ml.docilealligator.infinityforreddit.utils;
 
 import android.app.Activity;
 import android.content.Context;
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"