diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f23b672b..afa5a650 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tommychow.frosty">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <queries>
         <intent>
diff --git a/lib/api/twitch_api.dart b/lib/api/twitch_api.dart
index 39e54c1a..81f08ef3 100644
--- a/lib/api/twitch_api.dart
+++ b/lib/api/twitch_api.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
-import 'package:frosty/constants.dart';
+import 'package:frosty/constants/constants.dart';
 import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/category.dart';
 import 'package:frosty/models/channel.dart';
diff --git a/lib/constants.dart b/lib/constants/constants.dart
similarity index 100%
rename from lib/constants.dart
rename to lib/constants/constants.dart
diff --git a/lib/core/auth/auth_store.dart b/lib/core/auth/auth_store.dart
index f72afdb2..3477d189 100644
--- a/lib/core/auth/auth_store.dart
+++ b/lib/core/auth/auth_store.dart
@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_web_auth/flutter_web_auth.dart';
 import 'package:frosty/api/twitch_api.dart';
-import 'package:frosty/constants.dart';
+import 'package:frosty/constants/constants.dart';
 import 'package:frosty/core/user/user_store.dart';
 import 'package:mobx/mobx.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index 085a313f..df4f608b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/core/auth/auth_store.dart';
 import 'package:frosty/screens/home/home.dart';
-import 'package:frosty/screens/home/search/stores/search_store.dart';
 import 'package:frosty/screens/home/stores/categories_store.dart';
 import 'package:frosty/screens/home/stores/list_store.dart';
+import 'package:frosty/screens/home/stores/search_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:mobx/mobx.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/models/emotes.dart b/lib/models/emotes.dart
index bbe13821..075c349f 100644
--- a/lib/models/emotes.dart
+++ b/lib/models/emotes.dart
@@ -1,4 +1,4 @@
-import 'package:frosty/constants.dart';
+import 'package:frosty/constants/constants.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'emotes.g.dart';
diff --git a/lib/models/irc_message.dart b/lib/models/irc_message.dart
index 53ac8c6e..b8f24bc7 100644
--- a/lib/models/irc_message.dart
+++ b/lib/models/irc_message.dart
@@ -4,7 +4,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:frosty/models/emotes.dart';
-import 'package:frosty/screens/channel/chat/chat_assets_store.dart';
+import 'package:frosty/screens/channel/stores/chat_assets_store.dart';
 import 'package:intl/intl.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/screens/channel/chat/chat.dart b/lib/screens/channel/chat/chat.dart
index 9b9fe93e..3507204a 100644
--- a/lib/screens/channel/chat/chat.dart
+++ b/lib/screens/channel/chat/chat.dart
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/channel/chat/chat_bottom_bar.dart';
 import 'package:frosty/screens/channel/chat/chat_message.dart';
-import 'package:frosty/screens/channel/chat/chat_store.dart';
 import 'package:frosty/screens/channel/chat/chat_user_modal.dart';
 import 'package:frosty/screens/channel/chat/emote_menu/emote_menu.dart';
+import 'package:frosty/screens/channel/stores/chat_store.dart';
 
 class Chat extends StatefulWidget {
   final ChatStore chatStore;
diff --git a/lib/screens/channel/chat/chat_bottom_bar.dart b/lib/screens/channel/chat/chat_bottom_bar.dart
index 7c8703e1..43b76713 100644
--- a/lib/screens/channel/chat/chat_bottom_bar.dart
+++ b/lib/screens/channel/chat/chat_bottom_bar.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/screens/channel/chat/chat_store.dart';
 import 'package:frosty/screens/channel/chat/details/chat_details.dart';
+import 'package:frosty/screens/channel/stores/chat_store.dart';
 
 class ChatBottomBar extends StatelessWidget {
   final ChatStore chatStore;
diff --git a/lib/screens/channel/chat/chat_message.dart b/lib/screens/channel/chat/chat_message.dart
index 1fe73ec5..8376b938 100644
--- a/lib/screens/channel/chat/chat_message.dart
+++ b/lib/screens/channel/chat/chat_message.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/models/irc_message.dart';
-import 'package:frosty/screens/channel/chat/chat_assets_store.dart';
+import 'package:frosty/screens/channel/stores/chat_assets_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 
 class ChatMessage extends StatelessWidget {
diff --git a/lib/screens/channel/chat/chat_user_modal.dart b/lib/screens/channel/chat/chat_user_modal.dart
index 6bfdc141..0f6def27 100644
--- a/lib/screens/channel/chat/chat_user_modal.dart
+++ b/lib/screens/channel/chat/chat_user_modal.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:frosty/screens/channel/chat/chat_message.dart';
-import 'package:frosty/screens/channel/chat/chat_store.dart';
+import 'package:frosty/screens/channel/stores/chat_store.dart';
 import 'package:frosty/widgets/block_button.dart';
 import 'package:frosty/widgets/profile_picture.dart';
 import 'package:frosty/widgets/section_header.dart';
diff --git a/lib/screens/channel/chat/details/chat_details.dart b/lib/screens/channel/chat/details/chat_details.dart
index c83edd1e..45740686 100644
--- a/lib/screens/channel/chat/details/chat_details.dart
+++ b/lib/screens/channel/chat/details/chat_details.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
 import 'package:frosty/screens/channel/chat/details/chat_modes.dart';
 import 'package:frosty/screens/channel/chat/details/chat_users_list.dart';
+import 'package:frosty/screens/channel/stores/chat_details_store.dart';
 
 class ChatDetails extends StatelessWidget {
   final ChatDetailsStore chatDetails;
diff --git a/lib/screens/channel/chat/details/chat_users_list.dart b/lib/screens/channel/chat/details/chat_users_list.dart
index 6cfb4af9..e0a82d68 100644
--- a/lib/screens/channel/chat/details/chat_users_list.dart
+++ b/lib/screens/channel/chat/details/chat_users_list.dart
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
+import 'package:frosty/screens/channel/stores/chat_details_store.dart';
 import 'package:frosty/widgets/loading_indicator.dart';
 import 'package:frosty/widgets/scroll_to_top_button.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/screens/channel/chat/emote_menu/emote_menu.dart b/lib/screens/channel/chat/emote_menu/emote_menu.dart
index 13ef4855..06ead1b6 100644
--- a/lib/screens/channel/chat/emote_menu/emote_menu.dart
+++ b/lib/screens/channel/chat/emote_menu/emote_menu.dart
@@ -1,8 +1,8 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/screens/channel/chat/chat_assets_store.dart';
 import 'package:frosty/screens/channel/chat/emote_menu/emote_menu_panel.dart';
+import 'package:frosty/screens/channel/stores/chat_assets_store.dart';
 
 class EmoteMenu extends StatelessWidget {
   final ChatAssetsStore assetsStore;
diff --git a/lib/screens/channel/chat/chat_assets_store.dart b/lib/screens/channel/stores/chat_assets_store.dart
similarity index 100%
rename from lib/screens/channel/chat/chat_assets_store.dart
rename to lib/screens/channel/stores/chat_assets_store.dart
diff --git a/lib/screens/channel/chat/chat_assets_store.g.dart b/lib/screens/channel/stores/chat_assets_store.g.dart
similarity index 65%
rename from lib/screens/channel/chat/chat_assets_store.g.dart
rename to lib/screens/channel/stores/chat_assets_store.g.dart
index eaa98769..22ebf26d 100644
--- a/lib/screens/channel/chat/chat_assets_store.g.dart
+++ b/lib/screens/channel/stores/chat_assets_store.g.dart
@@ -12,27 +12,18 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
   Computed<List<Emote>>? _$bttvEmotesComputed;
 
   @override
-  List<Emote> get bttvEmotes =>
-      (_$bttvEmotesComputed ??= Computed<List<Emote>>(() => super.bttvEmotes,
-              name: '_ChatAssetsStoreBase.bttvEmotes'))
-          .value;
+  List<Emote> get bttvEmotes => (_$bttvEmotesComputed ??= Computed<List<Emote>>(() => super.bttvEmotes, name: '_ChatAssetsStoreBase.bttvEmotes')).value;
   Computed<List<Emote>>? _$ffzEmotesComputed;
 
   @override
-  List<Emote> get ffzEmotes =>
-      (_$ffzEmotesComputed ??= Computed<List<Emote>>(() => super.ffzEmotes,
-              name: '_ChatAssetsStoreBase.ffzEmotes'))
-          .value;
+  List<Emote> get ffzEmotes => (_$ffzEmotesComputed ??= Computed<List<Emote>>(() => super.ffzEmotes, name: '_ChatAssetsStoreBase.ffzEmotes')).value;
   Computed<List<Emote>>? _$sevenTvEmotesComputed;
 
   @override
-  List<Emote> get sevenTvEmotes => (_$sevenTvEmotesComputed ??=
-          Computed<List<Emote>>(() => super.sevenTvEmotes,
-              name: '_ChatAssetsStoreBase.sevenTvEmotes'))
-      .value;
+  List<Emote> get sevenTvEmotes =>
+      (_$sevenTvEmotesComputed ??= Computed<List<Emote>>(() => super.sevenTvEmotes, name: '_ChatAssetsStoreBase.sevenTvEmotes')).value;
 
-  final _$_emoteToObjectAtom =
-      Atom(name: '_ChatAssetsStoreBase._emoteToObject');
+  final _$_emoteToObjectAtom = Atom(name: '_ChatAssetsStoreBase._emoteToObject');
 
   Map<String, Emote> get emoteToObject {
     _$_emoteToObjectAtom.reportRead();
@@ -49,8 +40,7 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
     });
   }
 
-  final _$_userEmoteToObjectAtom =
-      Atom(name: '_ChatAssetsStoreBase._userEmoteToObject');
+  final _$_userEmoteToObjectAtom = Atom(name: '_ChatAssetsStoreBase._userEmoteToObject');
 
   Map<String, Emote> get userEmoteToObject {
     _$_userEmoteToObjectAtom.reportRead();
@@ -67,8 +57,7 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
     });
   }
 
-  final _$_userToFFZBadgesAtom =
-      Atom(name: '_ChatAssetsStoreBase._userToFFZBadges');
+  final _$_userToFFZBadgesAtom = Atom(name: '_ChatAssetsStoreBase._userToFFZBadges');
 
   Map<String, List<BadgeInfoFFZ>> get userToFFZBadges {
     _$_userToFFZBadgesAtom.reportRead();
@@ -85,8 +74,7 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
     });
   }
 
-  final _$_userTo7TVBadgesAtom =
-      Atom(name: '_ChatAssetsStoreBase._userTo7TVBadges');
+  final _$_userTo7TVBadgesAtom = Atom(name: '_ChatAssetsStoreBase._userTo7TVBadges');
 
   Map<String, List<BadgeInfo7TV>> get userTo7TVBadges {
     _$_userTo7TVBadgesAtom.reportRead();
@@ -103,8 +91,7 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
     });
   }
 
-  final _$_userToBTTVBadgesAtom =
-      Atom(name: '_ChatAssetsStoreBase._userToBTTVBadges');
+  final _$_userToBTTVBadgesAtom = Atom(name: '_ChatAssetsStoreBase._userToBTTVBadges');
 
   Map<String, BadgeInfoBTTV> get userToBTTVBadges {
     _$_userToBTTVBadgesAtom.reportRead();
@@ -121,8 +108,7 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
     });
   }
 
-  final _$emoteMenuIndexAtom =
-      Atom(name: '_ChatAssetsStoreBase.emoteMenuIndex');
+  final _$emoteMenuIndexAtom = Atom(name: '_ChatAssetsStoreBase.emoteMenuIndex');
 
   @override
   int get emoteMenuIndex {
@@ -155,38 +141,29 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store {
   final _$getAssetsAsyncAction = AsyncAction('_ChatAssetsStoreBase.getAssets');
 
   @override
-  Future<void> getAssets(
-      {required String channelName, required Map<String, String> headers}) {
-    return _$getAssetsAsyncAction
-        .run(() => super.getAssets(channelName: channelName, headers: headers));
+  Future<void> getAssets({required String channelName, required Map<String, String> headers}) {
+    return _$getAssetsAsyncAction.run(() => super.getAssets(channelName: channelName, headers: headers));
   }
 
   final _$getEmotesAsyncAction = AsyncAction('_ChatAssetsStoreBase.getEmotes');
 
   @override
-  Future<void> getEmotes(
-      {required UserTwitch channelInfo, required Map<String, String> headers}) {
-    return _$getEmotesAsyncAction
-        .run(() => super.getEmotes(channelInfo: channelInfo, headers: headers));
+  Future<void> getEmotes({required UserTwitch channelInfo, required Map<String, String> headers}) {
+    return _$getEmotesAsyncAction.run(() => super.getEmotes(channelInfo: channelInfo, headers: headers));
   }
 
   final _$getBadgesAsyncAction = AsyncAction('_ChatAssetsStoreBase.getBadges');
 
   @override
-  Future<void> getBadges(
-      {required UserTwitch channelInfo, required Map<String, String> headers}) {
-    return _$getBadgesAsyncAction
-        .run(() => super.getBadges(channelInfo: channelInfo, headers: headers));
+  Future<void> getBadges({required UserTwitch channelInfo, required Map<String, String> headers}) {
+    return _$getBadgesAsyncAction.run(() => super.getBadges(channelInfo: channelInfo, headers: headers));
   }
 
-  final _$getUserEmotesAsyncAction =
-      AsyncAction('_ChatAssetsStoreBase.getUserEmotes');
+  final _$getUserEmotesAsyncAction = AsyncAction('_ChatAssetsStoreBase.getUserEmotes');
 
   @override
-  Future<void> getUserEmotes(
-      {required List<String> emoteSets, required Map<String, String> headers}) {
-    return _$getUserEmotesAsyncAction
-        .run(() => super.getUserEmotes(emoteSets: emoteSets, headers: headers));
+  Future<void> getUserEmotes({required List<String> emoteSets, required Map<String, String> headers}) {
+    return _$getUserEmotesAsyncAction.run(() => super.getUserEmotes(emoteSets: emoteSets, headers: headers));
   }
 
   @override
diff --git a/lib/screens/channel/chat/details/chat_details_store.dart b/lib/screens/channel/stores/chat_details_store.dart
similarity index 100%
rename from lib/screens/channel/chat/details/chat_details_store.dart
rename to lib/screens/channel/stores/chat_details_store.dart
diff --git a/lib/screens/channel/chat/details/chat_details_store.g.dart b/lib/screens/channel/stores/chat_details_store.g.dart
similarity index 81%
rename from lib/screens/channel/chat/details/chat_details_store.g.dart
rename to lib/screens/channel/stores/chat_details_store.g.dart
index c100c15e..9b334950 100644
--- a/lib/screens/channel/chat/details/chat_details_store.g.dart
+++ b/lib/screens/channel/stores/chat_details_store.g.dart
@@ -12,10 +12,8 @@ mixin _$ChatDetailsStore on _ChatDetailsStoreBase, Store {
   Computed<Iterable<List<String>>>? _$filteredUsersComputed;
 
   @override
-  Iterable<List<String>> get filteredUsers => (_$filteredUsersComputed ??=
-          Computed<Iterable<List<String>>>(() => super.filteredUsers,
-              name: '_ChatDetailsStoreBase.filteredUsers'))
-      .value;
+  Iterable<List<String>> get filteredUsers =>
+      (_$filteredUsersComputed ??= Computed<Iterable<List<String>>>(() => super.filteredUsers, name: '_ChatDetailsStoreBase.filteredUsers')).value;
 
   final _$roomStateAtom = Atom(name: '_ChatDetailsStoreBase.roomState');
 
@@ -49,8 +47,7 @@ mixin _$ChatDetailsStore on _ChatDetailsStoreBase, Store {
     });
   }
 
-  final _$showJumpButtonAtom =
-      Atom(name: '_ChatDetailsStoreBase.showJumpButton');
+  final _$showJumpButtonAtom = Atom(name: '_ChatDetailsStoreBase.showJumpButton');
 
   @override
   bool get showJumpButton {
@@ -80,13 +77,11 @@ mixin _$ChatDetailsStore on _ChatDetailsStoreBase, Store {
     });
   }
 
-  final _$updateChattersAsyncAction =
-      AsyncAction('_ChatDetailsStoreBase.updateChatters');
+  final _$updateChattersAsyncAction = AsyncAction('_ChatDetailsStoreBase.updateChatters');
 
   @override
   Future<void> updateChatters(String userLogin) {
-    return _$updateChattersAsyncAction
-        .run(() => super.updateChatters(userLogin));
+    return _$updateChattersAsyncAction.run(() => super.updateChatters(userLogin));
   }
 
   @override
diff --git a/lib/screens/channel/chat/chat_store.dart b/lib/screens/channel/stores/chat_store.dart
similarity index 98%
rename from lib/screens/channel/chat/chat_store.dart
rename to lib/screens/channel/stores/chat_store.dart
index 75161c82..95d98870 100644
--- a/lib/screens/channel/chat/chat_store.dart
+++ b/lib/screens/channel/stores/chat_store.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:frosty/core/auth/auth_store.dart';
 import 'package:frosty/models/irc_message.dart';
-import 'package:frosty/screens/channel/chat/chat_assets_store.dart';
-import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
+import 'package:frosty/screens/channel/stores/chat_assets_store.dart';
+import 'package:frosty/screens/channel/stores/chat_details_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:mobx/mobx.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
diff --git a/lib/screens/channel/chat/chat_store.g.dart b/lib/screens/channel/stores/chat_store.g.dart
similarity index 91%
rename from lib/screens/channel/chat/chat_store.g.dart
rename to lib/screens/channel/stores/chat_store.g.dart
index 915f3162..b7eb6d9b 100644
--- a/lib/screens/channel/chat/chat_store.g.dart
+++ b/lib/screens/channel/stores/chat_store.g.dart
@@ -60,13 +60,11 @@ mixin _$ChatStore on _ChatStoreBase, Store {
     });
   }
 
-  final _$_ChatStoreBaseActionController =
-      ActionController(name: '_ChatStoreBase');
+  final _$_ChatStoreBaseActionController = ActionController(name: '_ChatStoreBase');
 
   @override
   void _handleIRCData(String data) {
-    final _$actionInfo = _$_ChatStoreBaseActionController.startAction(
-        name: '_ChatStoreBase._handleIRCData');
+    final _$actionInfo = _$_ChatStoreBaseActionController.startAction(name: '_ChatStoreBase._handleIRCData');
     try {
       return super._handleIRCData(data);
     } finally {
@@ -76,8 +74,7 @@ mixin _$ChatStore on _ChatStoreBase, Store {
 
   @override
   void resumeScroll() {
-    final _$actionInfo = _$_ChatStoreBaseActionController.startAction(
-        name: '_ChatStoreBase.resumeScroll');
+    final _$actionInfo = _$_ChatStoreBaseActionController.startAction(name: '_ChatStoreBase.resumeScroll');
     try {
       return super.resumeScroll();
     } finally {
diff --git a/lib/screens/channel/video/video_store.dart b/lib/screens/channel/stores/video_store.dart
similarity index 100%
rename from lib/screens/channel/video/video_store.dart
rename to lib/screens/channel/stores/video_store.dart
diff --git a/lib/screens/channel/video/video_store.g.dart b/lib/screens/channel/stores/video_store.g.dart
similarity index 87%
rename from lib/screens/channel/video/video_store.g.dart
rename to lib/screens/channel/stores/video_store.g.dart
index a592ff26..5519a885 100644
--- a/lib/screens/channel/video/video_store.g.dart
+++ b/lib/screens/channel/stores/video_store.g.dart
@@ -60,21 +60,18 @@ mixin _$VideoStore on _VideoStoreBase, Store {
     });
   }
 
-  final _$updateStreamInfoAsyncAction =
-      AsyncAction('_VideoStoreBase.updateStreamInfo');
+  final _$updateStreamInfoAsyncAction = AsyncAction('_VideoStoreBase.updateStreamInfo');
 
   @override
   Future<void> updateStreamInfo() {
     return _$updateStreamInfoAsyncAction.run(() => super.updateStreamInfo());
   }
 
-  final _$_VideoStoreBaseActionController =
-      ActionController(name: '_VideoStoreBase');
+  final _$_VideoStoreBaseActionController = ActionController(name: '_VideoStoreBase');
 
   @override
   void handlePausePlay() {
-    final _$actionInfo = _$_VideoStoreBaseActionController.startAction(
-        name: '_VideoStoreBase.handlePausePlay');
+    final _$actionInfo = _$_VideoStoreBaseActionController.startAction(name: '_VideoStoreBase.handlePausePlay');
     try {
       return super.handlePausePlay();
     } finally {
@@ -84,8 +81,7 @@ mixin _$VideoStore on _VideoStoreBase, Store {
 
   @override
   void handleVideoTap() {
-    final _$actionInfo = _$_VideoStoreBaseActionController.startAction(
-        name: '_VideoStoreBase.handleVideoTap');
+    final _$actionInfo = _$_VideoStoreBaseActionController.startAction(name: '_VideoStoreBase.handleVideoTap');
     try {
       return super.handleVideoTap();
     } finally {
@@ -95,8 +91,7 @@ mixin _$VideoStore on _VideoStoreBase, Store {
 
   @override
   void handleExpand() {
-    final _$actionInfo = _$_VideoStoreBaseActionController.startAction(
-        name: '_VideoStoreBase.handleExpand');
+    final _$actionInfo = _$_VideoStoreBaseActionController.startAction(name: '_VideoStoreBase.handleExpand');
     try {
       return super.handleExpand();
     } finally {
diff --git a/lib/screens/channel/video/video.dart b/lib/screens/channel/video/video.dart
index c8241d87..f36b37fb 100644
--- a/lib/screens/channel/video/video.dart
+++ b/lib/screens/channel/video/video.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/channel/stores/video_store.dart';
 import 'package:frosty/screens/channel/video/video_overlay.dart';
-import 'package:frosty/screens/channel/video/video_store.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 class Video extends StatelessWidget {
diff --git a/lib/screens/channel/video/video_overlay.dart b/lib/screens/channel/video/video_overlay.dart
index 4ab3b1bd..0361b87c 100644
--- a/lib/screens/channel/video/video_overlay.dart
+++ b/lib/screens/channel/video/video_overlay.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/screens/channel/video/video_store.dart';
+import 'package:frosty/screens/channel/stores/video_store.dart';
 import 'package:frosty/screens/settings/settings.dart';
 import 'package:intl/intl.dart';
 
diff --git a/lib/screens/channel/video_chat.dart b/lib/screens/channel/video_chat.dart
index 3bc667a4..eb8702a7 100644
--- a/lib/screens/channel/video_chat.dart
+++ b/lib/screens/channel/video_chat.dart
@@ -3,9 +3,9 @@ import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/core/auth/auth_store.dart';
 import 'package:frosty/screens/channel/chat/chat.dart';
-import 'package:frosty/screens/channel/chat/chat_store.dart';
+import 'package:frosty/screens/channel/stores/chat_store.dart';
+import 'package:frosty/screens/channel/stores/video_store.dart';
 import 'package:frosty/screens/channel/video/video.dart';
-import 'package:frosty/screens/channel/video/video_store.dart';
 import 'package:frosty/screens/settings/settings.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart
index b8796256..f6aa3519 100644
--- a/lib/screens/home/home.dart
+++ b/lib/screens/home/home.dart
@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/core/auth/auth_store.dart';
 import 'package:frosty/screens/home/search/search.dart';
-import 'package:frosty/screens/home/search/stores/search_store.dart';
 import 'package:frosty/screens/home/stores/categories_store.dart';
 import 'package:frosty/screens/home/stores/list_store.dart';
-import 'package:frosty/screens/home/streams_list.dart';
+import 'package:frosty/screens/home/stores/search_store.dart';
 import 'package:frosty/screens/home/top/top_section.dart';
+import 'package:frosty/screens/home/widgets/streams_list.dart';
 import 'package:frosty/screens/settings/settings.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/screens/home/search/search.dart b/lib/screens/home/search/search.dart
index b0f3355f..8e0a604b 100644
--- a/lib/screens/home/search/search.dart
+++ b/lib/screens/home/search/search.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/home/search/search_results_categories.dart';
 import 'package:frosty/screens/home/search/search_results_channels.dart';
-import 'package:frosty/screens/home/search/stores/search_store.dart';
+import 'package:frosty/screens/home/stores/search_store.dart';
 import 'package:frosty/widgets/section_header.dart';
 
 class Search extends StatefulWidget {
diff --git a/lib/screens/home/search/search_results_categories.dart b/lib/screens/home/search/search_results_categories.dart
index 5c5e59b4..7f5dde3a 100644
--- a/lib/screens/home/search/search_results_categories.dart
+++ b/lib/screens/home/search/search_results_categories.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/models/category.dart';
-import 'package:frosty/screens/home/search/stores/search_store.dart';
-import 'package:frosty/screens/home/top/categories/category_card.dart';
+import 'package:frosty/screens/home/stores/search_store.dart';
+import 'package:frosty/screens/home/widgets/category_card.dart';
 import 'package:frosty/widgets/loading_indicator.dart';
 import 'package:mobx/mobx.dart';
 
diff --git a/lib/screens/home/search/search_results_channels.dart b/lib/screens/home/search/search_results_channels.dart
index 87bc370d..a510e33d 100644
--- a/lib/screens/home/search/search_results_channels.dart
+++ b/lib/screens/home/search/search_results_channels.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/models/channel.dart';
 import 'package:frosty/screens/channel/video_chat.dart';
-import 'package:frosty/screens/home/search/stores/search_store.dart';
+import 'package:frosty/screens/home/stores/search_store.dart';
 import 'package:frosty/widgets/loading_indicator.dart';
 import 'package:frosty/widgets/profile_picture.dart';
 import 'package:mobx/mobx.dart';
diff --git a/lib/screens/home/search/stores/search_store.dart b/lib/screens/home/stores/search_store.dart
similarity index 100%
rename from lib/screens/home/search/stores/search_store.dart
rename to lib/screens/home/stores/search_store.dart
diff --git a/lib/screens/home/search/stores/search_store.g.dart b/lib/screens/home/stores/search_store.g.dart
similarity index 100%
rename from lib/screens/home/search/stores/search_store.g.dart
rename to lib/screens/home/stores/search_store.g.dart
diff --git a/lib/screens/home/top/categories/categories.dart b/lib/screens/home/top/categories.dart
similarity index 96%
rename from lib/screens/home/top/categories/categories.dart
rename to lib/screens/home/top/categories.dart
index 49e09171..87db79f3 100644
--- a/lib/screens/home/top/categories/categories.dart
+++ b/lib/screens/home/top/categories.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/home/stores/categories_store.dart';
-import 'package:frosty/screens/home/top/categories/category_card.dart';
+import 'package:frosty/screens/home/widgets/category_card.dart';
 import 'package:frosty/widgets/scroll_to_top_button.dart';
 
 class Categories extends StatefulWidget {
diff --git a/lib/screens/home/top/categories/category_streams.dart b/lib/screens/home/top/category_streams.dart
similarity index 98%
rename from lib/screens/home/top/categories/category_streams.dart
rename to lib/screens/home/top/category_streams.dart
index e4abd206..aa8cd11a 100644
--- a/lib/screens/home/top/categories/category_streams.dart
+++ b/lib/screens/home/top/category_streams.dart
@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/home/stores/list_store.dart';
+import 'package:frosty/screens/home/widgets/stream_card.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:frosty/widgets/scroll_to_top_button.dart';
-import 'package:frosty/widgets/stream_card.dart';
 import 'package:provider/provider.dart';
 
 class CategoryStreams extends StatelessWidget {
diff --git a/lib/screens/home/top/top_section.dart b/lib/screens/home/top/top_section.dart
index 4a525538..7c854552 100644
--- a/lib/screens/home/top/top_section.dart
+++ b/lib/screens/home/top/top_section.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:frosty/screens/home/stores/categories_store.dart';
 import 'package:frosty/screens/home/stores/list_store.dart';
-import 'package:frosty/screens/home/streams_list.dart';
-import 'package:frosty/screens/home/top/categories/categories.dart';
+import 'package:frosty/screens/home/top/categories.dart';
+import 'package:frosty/screens/home/widgets/streams_list.dart';
 
 class TopSection extends StatelessWidget {
   final ListStore topSectionStore;
diff --git a/lib/screens/home/top/categories/category_card.dart b/lib/screens/home/widgets/category_card.dart
similarity index 95%
rename from lib/screens/home/top/categories/category_card.dart
rename to lib/screens/home/widgets/category_card.dart
index de1420d9..1dace66f 100644
--- a/lib/screens/home/top/categories/category_card.dart
+++ b/lib/screens/home/widgets/category_card.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:frosty/core/auth/auth_store.dart';
 import 'package:frosty/models/category.dart';
 import 'package:frosty/screens/home/stores/list_store.dart';
-import 'package:frosty/screens/home/top/categories/category_streams.dart';
+import 'package:frosty/screens/home/top/category_streams.dart';
 import 'package:provider/provider.dart';
 
 /// A tappable card widget that displays a category's box art and name.
diff --git a/lib/widgets/stream_card.dart b/lib/screens/home/widgets/stream_card.dart
similarity index 100%
rename from lib/widgets/stream_card.dart
rename to lib/screens/home/widgets/stream_card.dart
diff --git a/lib/screens/home/streams_list.dart b/lib/screens/home/widgets/streams_list.dart
similarity index 97%
rename from lib/screens/home/streams_list.dart
rename to lib/screens/home/widgets/streams_list.dart
index 5d0e0470..7f33f10d 100644
--- a/lib/screens/home/streams_list.dart
+++ b/lib/screens/home/widgets/streams_list.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/home/stores/list_store.dart';
+import 'package:frosty/screens/home/widgets/stream_card.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:frosty/widgets/loading_indicator.dart';
 import 'package:frosty/widgets/scroll_to_top_button.dart';
-import 'package:frosty/widgets/stream_card.dart';
 import 'package:provider/provider.dart';
 
 class StreamsList extends StatefulWidget {
diff --git a/lib/screens/settings/account/account_settings.dart b/lib/screens/settings/account_settings.dart
similarity index 94%
rename from lib/screens/settings/account/account_settings.dart
rename to lib/screens/settings/account_settings.dart
index 1d8f2d45..e0c3ad03 100644
--- a/lib/screens/settings/account/account_settings.dart
+++ b/lib/screens/settings/account_settings.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:frosty/core/auth/auth_store.dart';
-import 'package:frosty/screens/settings/account/blocked_users.dart';
-import 'package:frosty/screens/settings/account/profile_card.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/screens/settings/widgets/blocked_users.dart';
+import 'package:frosty/screens/settings/widgets/profile_card.dart';
 import 'package:frosty/widgets/section_header.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart
index 4afe63b7..248b6b9a 100644
--- a/lib/screens/settings/settings.dart
+++ b/lib/screens/settings/settings.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:frosty/core/auth/auth_store.dart';
-import 'package:frosty/screens/settings/account/account_settings.dart';
+import 'package:frosty/screens/settings/account_settings.dart';
 import 'package:frosty/screens/settings/chat_settings.dart';
 import 'package:frosty/screens/settings/general_settings.dart';
 import 'package:frosty/screens/settings/other_settings.dart';
diff --git a/lib/screens/settings/account/blocked_users.dart b/lib/screens/settings/widgets/blocked_users.dart
similarity index 100%
rename from lib/screens/settings/account/blocked_users.dart
rename to lib/screens/settings/widgets/blocked_users.dart
diff --git a/lib/screens/settings/account/profile_card.dart b/lib/screens/settings/widgets/profile_card.dart
similarity index 100%
rename from lib/screens/settings/account/profile_card.dart
rename to lib/screens/settings/widgets/profile_card.dart