feat(router): re-implementation of routing via go_router

[skip ci]
JagandeepBrar · Aug 30, 2022 · 1d4207a · 1d4207a
1 parent 9960124
commit 1d4207a
Show file tree

Hide file tree

Showing 815 changed files with 3,788 additions and 4,647 deletions.
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
@@ -45,6 +45,7 @@
     "LunaConfig",
     "lunasea",
     "LunaTable",
+    "microtask",
     "msix",
     "Newznab",
     "NZBGet",
@@ -61,6 +62,7 @@
     "Sonarr",
     "stickied",
     "subheaders",
+    "subroutes",
     "Tautulli",
     "TestFlight",
     "Trakt",

diff --git a/lib/modules/overseerr/api/models.dart → lib/api/overseerr/models.dart b/lib/modules/overseerr/api/models.dart → lib/api/overseerr/models.dart
diff --git a/...rseerr/api/models/content/collection.dart → .../overseerr/models/content/collection.dart b/...rseerr/api/models/content/collection.dart → .../overseerr/models/content/collection.dart
diff --git a/...r/api/models/content/content_ratings.dart → ...seerr/models/content/content_ratings.dart b/...r/api/models/content/content_ratings.dart → ...seerr/models/content/content_ratings.dart
diff --git a/...rseerr/api/models/content/created_by.dart → .../overseerr/models/content/created_by.dart b/...rseerr/api/models/content/created_by.dart → .../overseerr/models/content/created_by.dart
diff --git a/...overseerr/api/models/content/credits.dart → ...api/overseerr/models/content/credits.dart b/...overseerr/api/models/content/credits.dart → ...api/overseerr/models/content/credits.dart
diff --git a/...overseerr/api/models/content/episode.dart → ...api/overseerr/models/content/episode.dart b/...overseerr/api/models/content/episode.dart → ...api/overseerr/models/content/episode.dart
diff --git a/...eerr/api/models/content/external_ids.dart → ...verseerr/models/content/external_ids.dart b/...eerr/api/models/content/external_ids.dart → ...verseerr/models/content/external_ids.dart
diff --git a/...s/overseerr/api/models/content/genre.dart → lib/api/overseerr/models/content/genre.dart b/...s/overseerr/api/models/content/genre.dart → lib/api/overseerr/models/content/genre.dart
diff --git a/...overseerr/api/models/content/keyword.dart → ...api/overseerr/models/content/keyword.dart b/...overseerr/api/models/content/keyword.dart → ...api/overseerr/models/content/keyword.dart
diff --git a/...s/overseerr/api/models/content/movie.dart → lib/api/overseerr/models/content/movie.dart b/...s/overseerr/api/models/content/movie.dart → lib/api/overseerr/models/content/movie.dart
@@ -1,5 +1,5 @@
+import 'package:lunasea/api/overseerr/models.dart';
 import 'package:lunasea/core.dart';
-import 'package:lunasea/modules/overseerr.dart';
 
 part 'movie.g.dart';
 

diff --git a/...rr/api/models/content/movie_releases.dart → ...rseerr/models/content/movie_releases.dart b/...rr/api/models/content/movie_releases.dart → ...rseerr/models/content/movie_releases.dart
diff --git a/...overseerr/api/models/content/network.dart → ...api/overseerr/models/content/network.dart b/...overseerr/api/models/content/network.dart → ...api/overseerr/models/content/network.dart
diff --git a/...pi/models/content/production_company.dart → ...rr/models/content/production_company.dart b/...pi/models/content/production_company.dart → ...rr/models/content/production_company.dart
diff --git a/...pi/models/content/production_country.dart → ...rr/models/content/production_country.dart b/...pi/models/content/production_country.dart → ...rr/models/content/production_country.dart
diff --git a/...err/api/models/content/related_video.dart → ...erseerr/models/content/related_video.dart b/...err/api/models/content/related_video.dart → ...erseerr/models/content/related_video.dart
diff --git a/.../overseerr/api/models/content/season.dart → lib/api/overseerr/models/content/season.dart b/.../overseerr/api/models/content/season.dart → lib/api/overseerr/models/content/season.dart
diff --git a/.../overseerr/api/models/content/series.dart → lib/api/overseerr/models/content/series.dart b/.../overseerr/api/models/content/series.dart → lib/api/overseerr/models/content/series.dart
@@ -1,5 +1,5 @@
 import 'package:lunasea/core.dart';
-import 'package:lunasea/modules/overseerr.dart';
+import 'package:lunasea/api/overseerr/models.dart';
 
 part 'series.g.dart';
 

diff --git a/...r/api/models/content/spoken_language.dart → ...seerr/models/content/spoken_language.dart b/...r/api/models/content/spoken_language.dart → ...seerr/models/content/spoken_language.dart
diff --git a/...rr/api/models/content/watch_provider.dart → ...rseerr/models/content/watch_provider.dart b/...rr/api/models/content/watch_provider.dart → ...rseerr/models/content/watch_provider.dart
diff --git a/...es/overseerr/api/models/issues/issue.dart → lib/api/overseerr/models/issues/issue.dart b/...es/overseerr/api/models/issues/issue.dart → lib/api/overseerr/models/issues/issue.dart
@@ -1,5 +1,6 @@
+import 'package:lunasea/api/overseerr/models.dart';
+import 'package:lunasea/api/overseerr/types.dart';
 import 'package:lunasea/core.dart';
-import 'package:lunasea/modules/overseerr.dart';
 import 'package:lunasea/utils/parser.dart';
 
 part 'issue.g.dart';

diff --git a/...eerr/api/models/issues/issue_comment.dart → ...verseerr/models/issues/issue_comment.dart b/...eerr/api/models/issues/issue_comment.dart → ...verseerr/models/issues/issue_comment.dart
@@ -1,5 +1,5 @@
 import 'package:lunasea/core.dart';
-import 'package:lunasea/modules/overseerr.dart';
+import 'package:lunasea/api/overseerr/models.dart';
 import 'package:lunasea/utils/parser.dart';
 
 part 'issue_comment.g.dart';

diff --git a/...erseerr/api/models/issues/issue_page.dart → ...i/overseerr/models/issues/issue_page.dart b/...erseerr/api/models/issues/issue_page.dart → ...i/overseerr/models/issues/issue_page.dart
@@ -1,5 +1,5 @@
 import 'package:lunasea/core.dart';
-import 'package:lunasea/modules/overseerr.dart';
+import 'package:lunasea/api/overseerr/models.dart';
 
 part 'issue_page.g.dart';
 

diff --git a/...les/overseerr/api/models/media/media.dart → lib/api/overseerr/models/media/media.dart b/...les/overseerr/api/models/media/media.dart → lib/api/overseerr/models/media/media.dart
diff --git a/...es/overseerr/api/models/media/season.dart → lib/api/overseerr/models/media/season.dart b/...es/overseerr/api/models/media/season.dart → lib/api/overseerr/models/media/season.dart
diff --git a/lib/modules/overseerr/api/models/page.dart → lib/api/overseerr/models/page.dart b/lib/modules/overseerr/api/models/page.dart → lib/api/overseerr/models/page.dart
diff --git a/lib/modules/overseerr/api/models/quota.dart → lib/api/overseerr/models/quota.dart b/lib/modules/overseerr/api/models/quota.dart → lib/api/overseerr/models/quota.dart
diff --git a/...verseerr/api/models/requests/request.dart → ...pi/overseerr/models/requests/request.dart b/...verseerr/api/models/requests/request.dart → ...pi/overseerr/models/requests/request.dart
diff --git a/...rr/api/models/requests/request_count.dart → ...rseerr/models/requests/request_count.dart b/...rr/api/models/requests/request_count.dart → ...rseerr/models/requests/request_count.dart
diff --git a/...err/api/models/requests/request_page.dart → ...erseerr/models/requests/request_page.dart b/...err/api/models/requests/request_page.dart → ...erseerr/models/requests/request_page.dart
diff --git a/...s/overseerr/api/models/status/status.dart → lib/api/overseerr/models/status/status.dart b/...s/overseerr/api/models/status/status.dart → lib/api/overseerr/models/status/status.dart
diff --git a/...err/api/models/status/status_appdata.dart → ...erseerr/models/status/status_appdata.dart b/...err/api/models/status/status_appdata.dart → ...erseerr/models/status/status_appdata.dart
diff --git a/...ules/overseerr/api/models/users/user.dart → lib/api/overseerr/models/users/user.dart b/...ules/overseerr/api/models/users/user.dart → lib/api/overseerr/models/users/user.dart
diff --git a/...overseerr/api/models/users/user_page.dart → ...api/overseerr/models/users/user_page.dart b/...overseerr/api/models/users/user_page.dart → ...api/overseerr/models/users/user_page.dart
diff --git a/...verseerr/api/models/users/user_quota.dart → ...pi/overseerr/models/users/user_quota.dart b/...verseerr/api/models/users/user_quota.dart → ...pi/overseerr/models/users/user_quota.dart
diff --git a/lib/modules/overseerr/api/overseerr.dart → lib/api/overseerr/overseerr.dart b/lib/modules/overseerr/api/overseerr.dart → lib/api/overseerr/overseerr.dart
@@ -1,12 +1,12 @@
 import 'package:dio/dio.dart';
 import 'package:retrofit/retrofit.dart';
-import 'package:lunasea/modules/overseerr/api/models.dart';
+import 'package:lunasea/api/overseerr/models.dart';
 
 part 'overseerr.g.dart';
 
 @RestApi()
-abstract class Overseerr {
-  factory Overseerr({
+abstract class OverseerrAPI {
+  factory OverseerrAPI({
     required String host,
     required String apiKey,
     Map<String, dynamic> headers = const {},
@@ -22,7 +22,7 @@ abstract class Overseerr {
         maxRedirects: 5,
       ),
     );
-    return _Overseerr(_dio, baseUrl: _baseUrl);
+    return _OverseerrAPI(_dio, baseUrl: _baseUrl);
   }
 
   @GET('issue')

diff --git a/lib/modules/overseerr/api/types.dart → lib/api/overseerr/types.dart b/lib/modules/overseerr/api/types.dart → lib/api/overseerr/types.dart
diff --git a/...verseerr/api/types/issue_filter_type.dart → ...pi/overseerr/types/issue_filter_type.dart b/...verseerr/api/types/issue_filter_type.dart → ...pi/overseerr/types/issue_filter_type.dart
diff --git a/.../overseerr/api/types/issue_sort_type.dart → lib/api/overseerr/types/issue_sort_type.dart b/.../overseerr/api/types/issue_sort_type.dart → lib/api/overseerr/types/issue_sort_type.dart
diff --git a/...les/overseerr/api/types/issue_status.dart → lib/api/overseerr/types/issue_status.dart b/...les/overseerr/api/types/issue_status.dart → lib/api/overseerr/types/issue_status.dart
diff --git a/...dules/overseerr/api/types/issue_type.dart → lib/api/overseerr/types/issue_type.dart b/...dules/overseerr/api/types/issue_type.dart → lib/api/overseerr/types/issue_type.dart
diff --git a/...les/overseerr/api/types/media_status.dart → lib/api/overseerr/types/media_status.dart b/...les/overseerr/api/types/media_status.dart → lib/api/overseerr/types/media_status.dart
diff --git a/...dules/overseerr/api/types/media_type.dart → lib/api/overseerr/types/media_type.dart b/...dules/overseerr/api/types/media_type.dart → lib/api/overseerr/types/media_type.dart
diff --git a/...rseerr/api/types/request_filter_type.dart → .../overseerr/types/request_filter_type.dart b/...rseerr/api/types/request_filter_type.dart → .../overseerr/types/request_filter_type.dart
diff --git a/...verseerr/api/types/request_sort_type.dart → ...pi/overseerr/types/request_sort_type.dart b/...verseerr/api/types/request_sort_type.dart → ...pi/overseerr/types/request_sort_type.dart
diff --git a/...s/overseerr/api/types/request_status.dart → lib/api/overseerr/types/request_status.dart b/...s/overseerr/api/types/request_status.dart → lib/api/overseerr/types/request_status.dart
diff --git a/...s/overseerr/api/types/user_sort_type.dart → lib/api/overseerr/types/user_sort_type.dart b/...s/overseerr/api/types/user_sort_type.dart → lib/api/overseerr/types/user_sort_type.dart
diff --git a/lib/modules/radarr/api/commands.dart → lib/api/radarr/commands.dart b/lib/modules/radarr/api/commands.dart → lib/api/radarr/commands.dart
@@ -2,8 +2,8 @@
 library radarr_commands;
 
 import 'package:dio/dio.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
+import 'package:lunasea/api/radarr/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
 
 // Commands
 part 'src/commands/command.dart';

diff --git a/lib/modules/radarr/api/models.dart → lib/api/radarr/models.dart b/lib/modules/radarr/api/models.dart → lib/api/radarr/models.dart
diff --git a/lib/modules/radarr/api/radarr.dart → lib/api/radarr/radarr.dart b/lib/modules/radarr/api/radarr.dart → lib/api/radarr/radarr.dart
@@ -8,16 +8,16 @@ library radarr;
 
 // Imports
 import 'package:dio/dio.dart';
-import 'package:lunasea/modules/radarr/api/commands.dart';
+import 'package:lunasea/api/radarr/commands.dart';
 
 /// The core class to handle all connections to Radarr.
 /// Gives you easy access to all implemented command handlers, initialized and ready to call.
 ///
-/// [Radarr] handles the creation of the initial [Dio] HTTP client & command handlers.
+/// [RadarrAPI] handles the creation of the initial [Dio] HTTP client & command handlers.
 /// You can optionally use the factory `.from()` to define your own [Dio] HTTP client.
-class Radarr {
+class RadarrAPI {
   /// Internal constructor
-  Radarr._internal({
+  RadarrAPI._internal({
     required this.httpClient,
     required this.command,
     required this.credits,
@@ -51,7 +51,7 @@ class Radarr {
   /// - `headers`: Map that contains additional headers that should be attached to all requests
   /// - `followRedirects`: If the HTTP client should follow URL redirects
   /// - `maxRedirects`: The maximum amount of redirects the client should follow (does nothing if `followRedirects` is false)
-  factory Radarr({
+  factory RadarrAPI({
     required String host,
     required String apiKey,
     Map<String, dynamic>? headers,
@@ -70,7 +70,7 @@ class Radarr {
         maxRedirects: maxRedirects,
       ),
     );
-    return Radarr._internal(
+    return RadarrAPI._internal(
       httpClient: _dio,
       command: RadarrCommandHandlerCommand(_dio),
       credits: RadarrCommandHandlerCredits(_dio),
@@ -112,10 +112,10 @@ class Radarr {
   ///     ),
   /// );
   /// ```
-  factory Radarr.from({
+  factory RadarrAPI.from({
     required Dio client,
   }) {
-    return Radarr._internal(
+    return RadarrAPI._internal(
       httpClient: client,
       command: RadarrCommandHandlerCommand(client),
       credits: RadarrCommandHandlerCredits(client),

diff --git a/...ules/radarr/api/src/commands/command.dart → lib/api/radarr/src/commands/command.dart b/...ules/radarr/api/src/commands/command.dart → lib/api/radarr/src/commands/command.dart
diff --git a/...darr/api/src/commands/command/backup.dart → ...i/radarr/src/commands/command/backup.dart b/...darr/api/src/commands/command/backup.dart → ...i/radarr/src/commands/command/backup.dart
diff --git a/...mands/command/downloaded_movies_scan.dart → ...mands/command/downloaded_movies_scan.dart b/...mands/command/downloaded_movies_scan.dart → ...mands/command/downloaded_movies_scan.dart
diff --git a/...i/src/commands/command/manual_import.dart → ...r/src/commands/command/manual_import.dart b/...i/src/commands/command/manual_import.dart → ...r/src/commands/command/manual_import.dart
diff --git a/...ommands/command/missing_movie_search.dart → ...ommands/command/missing_movie_search.dart b/...ommands/command/missing_movie_search.dart → ...ommands/command/missing_movie_search.dart
diff --git a/...i/src/commands/command/movies_search.dart → ...r/src/commands/command/movies_search.dart b/...i/src/commands/command/movies_search.dart → ...r/src/commands/command/movies_search.dart
diff --git a/.../command/refresh_monitored_downloads.dart → .../command/refresh_monitored_downloads.dart b/.../command/refresh_monitored_downloads.dart → .../command/refresh_monitored_downloads.dart
diff --git a/...i/src/commands/command/refresh_movie.dart → ...r/src/commands/command/refresh_movie.dart b/...i/src/commands/command/refresh_movie.dart → ...r/src/commands/command/refresh_movie.dart
diff --git a/...rr/api/src/commands/command/rss_sync.dart → ...radarr/src/commands/command/rss_sync.dart b/...rr/api/src/commands/command/rss_sync.dart → ...radarr/src/commands/command/rss_sync.dart
diff --git a/...ules/radarr/api/src/commands/credits.dart → lib/api/radarr/src/commands/credits.dart b/...ules/radarr/api/src/commands/credits.dart → lib/api/radarr/src/commands/credits.dart
diff --git a/...api/src/commands/credits/get_credits.dart → ...arr/src/commands/credits/get_credits.dart b/...api/src/commands/credits/get_credits.dart → ...arr/src/commands/credits/get_credits.dart
diff --git a/...s/radarr/api/src/commands/exclusions.dart → lib/api/radarr/src/commands/exclusions.dart b/...s/radarr/api/src/commands/exclusions.dart → lib/api/radarr/src/commands/exclusions.dart
diff --git a/...mmands/exclusions/get_all_exclusions.dart → ...mmands/exclusions/get_all_exclusions.dart b/...mmands/exclusions/get_all_exclusions.dart → ...mmands/exclusions/get_all_exclusions.dart
diff --git a/...rc/commands/exclusions/get_exclusion.dart → ...rc/commands/exclusions/get_exclusion.dart b/...rc/commands/exclusions/get_exclusion.dart → ...rc/commands/exclusions/get_exclusion.dart
diff --git a/...s/radarr/api/src/commands/extra_file.dart → lib/api/radarr/src/commands/extra_file.dart b/...s/radarr/api/src/commands/extra_file.dart → lib/api/radarr/src/commands/extra_file.dart
diff --git a/.../commands/extra_file/get_extra_files.dart → .../commands/extra_file/get_extra_files.dart b/.../commands/extra_file/get_extra_files.dart → .../commands/extra_file/get_extra_files.dart
diff --git a/...s/radarr/api/src/commands/filesystem.dart → lib/api/radarr/src/commands/filesystem.dart b/...s/radarr/api/src/commands/filesystem.dart → lib/api/radarr/src/commands/filesystem.dart
diff --git a/...mands/filesystem/get_all_disk_spaces.dart → ...mands/filesystem/get_all_disk_spaces.dart b/...mands/filesystem/get_all_disk_spaces.dart → ...mands/filesystem/get_all_disk_spaces.dart
diff --git a/...c/commands/filesystem/get_filesystem.dart → ...c/commands/filesystem/get_filesystem.dart b/...c/commands/filesystem/get_filesystem.dart → ...c/commands/filesystem/get_filesystem.dart
diff --git a/...radarr/api/src/commands/health_check.dart → ...api/radarr/src/commands/health_check.dart b/...radarr/api/src/commands/health_check.dart → ...api/radarr/src/commands/health_check.dart
diff --git a/...s/health_check/get_all_health_checks.dart → ...s/health_check/get_all_health_checks.dart b/...s/health_check/get_all_health_checks.dart → ...s/health_check/get_all_health_checks.dart
diff --git a/...ules/radarr/api/src/commands/history.dart → lib/api/radarr/src/commands/history.dart b/...ules/radarr/api/src/commands/history.dart → lib/api/radarr/src/commands/history.dart
diff --git a/...api/src/commands/history/get_history.dart → ...arr/src/commands/history/get_history.dart b/...api/src/commands/history/get_history.dart → ...arr/src/commands/history/get_history.dart
diff --git a/...c/commands/history/get_movie_history.dart → ...c/commands/history/get_movie_history.dart b/...c/commands/history/get_movie_history.dart → ...c/commands/history/get_movie_history.dart
diff --git a/.../radarr/api/src/commands/import_list.dart → lib/api/radarr/src/commands/import_list.dart b/.../radarr/api/src/commands/import_list.dart → lib/api/radarr/src/commands/import_list.dart
diff --git a/...nds/import_list/get_all_import_lists.dart → ...nds/import_list/get_all_import_lists.dart b/...nds/import_list/get_all_import_lists.dart → ...nds/import_list/get_all_import_lists.dart
diff --git a/...commands/import_list/get_import_list.dart → ...commands/import_list/get_import_list.dart b/...commands/import_list/get_import_list.dart → ...commands/import_list/get_import_list.dart
diff --git a/...nds/import_list/get_movies_from_list.dart → ...nds/import_list/get_movies_from_list.dart b/...nds/import_list/get_movies_from_list.dart → ...nds/import_list/get_movies_from_list.dart
diff --git a/...les/radarr/api/src/commands/language.dart → lib/api/radarr/src/commands/language.dart b/...les/radarr/api/src/commands/language.dart → lib/api/radarr/src/commands/language.dart
diff --git a/.../commands/language/get_all_languages.dart → .../commands/language/get_all_languages.dart b/.../commands/language/get_all_languages.dart → .../commands/language/get_all_languages.dart
diff --git a/...i/src/commands/language/get_language.dart → ...r/src/commands/language/get_language.dart b/...i/src/commands/language/get_language.dart → ...r/src/commands/language/get_language.dart
diff --git a/...adarr/api/src/commands/manual_import.dart → ...pi/radarr/src/commands/manual_import.dart b/...adarr/api/src/commands/manual_import.dart → ...pi/radarr/src/commands/manual_import.dart
diff --git a/...ands/manual_import/get_manual_import.dart → ...ands/manual_import/get_manual_import.dart b/...ands/manual_import/get_manual_import.dart → ...ands/manual_import/get_manual_import.dart
diff --git a/...s/manual_import/update_manual_import.dart → ...s/manual_import/update_manual_import.dart b/...s/manual_import/update_manual_import.dart → ...s/manual_import/update_manual_import.dart
diff --git a/...odules/radarr/api/src/commands/movie.dart → lib/api/radarr/src/commands/movie.dart b/...odules/radarr/api/src/commands/movie.dart → lib/api/radarr/src/commands/movie.dart
diff --git a/...arr/api/src/commands/movie/add_movie.dart → .../radarr/src/commands/movie/add_movie.dart b/...arr/api/src/commands/movie/add_movie.dart → .../radarr/src/commands/movie/add_movie.dart
diff --git a/.../api/src/commands/movie/delete_movie.dart → ...darr/src/commands/movie/delete_movie.dart b/.../api/src/commands/movie/delete_movie.dart → ...darr/src/commands/movie/delete_movie.dart
diff --git a/...pi/src/commands/movie/get_all_movies.dart → ...rr/src/commands/movie/get_all_movies.dart b/...pi/src/commands/movie/get_all_movies.dart → ...rr/src/commands/movie/get_all_movies.dart
diff --git a/...arr/api/src/commands/movie/get_movie.dart → .../radarr/src/commands/movie/get_movie.dart b/...arr/api/src/commands/movie/get_movie.dart → .../radarr/src/commands/movie/get_movie.dart
diff --git a/.../api/src/commands/movie/update_movie.dart → ...darr/src/commands/movie/update_movie.dart b/.../api/src/commands/movie/update_movie.dart → ...darr/src/commands/movie/update_movie.dart
diff --git a/...s/radarr/api/src/commands/movie_file.dart → lib/api/radarr/src/commands/movie_file.dart b/...s/radarr/api/src/commands/movie_file.dart → lib/api/radarr/src/commands/movie_file.dart
diff --git a/...ommands/movie_file/delete_movie_file.dart → ...ommands/movie_file/delete_movie_file.dart b/...ommands/movie_file/delete_movie_file.dart → ...ommands/movie_file/delete_movie_file.dart
diff --git a/...c/commands/movie_file/get_movie_file.dart → ...c/commands/movie_file/get_movie_file.dart b/...c/commands/movie_file/get_movie_file.dart → ...c/commands/movie_file/get_movie_file.dart
diff --git a/...radarr/api/src/commands/movie_lookup.dart → ...api/radarr/src/commands/movie_lookup.dart b/...radarr/api/src/commands/movie_lookup.dart → ...api/radarr/src/commands/movie_lookup.dart
diff --git a/...mmands/movie_lookup/get_movie_lookup.dart → ...mmands/movie_lookup/get_movie_lookup.dart b/...mmands/movie_lookup/get_movie_lookup.dart → ...mmands/movie_lookup/get_movie_lookup.dart
diff --git a/...arr/api/src/commands/quality_profile.dart → .../radarr/src/commands/quality_profile.dart b/...arr/api/src/commands/quality_profile.dart → .../radarr/src/commands/quality_profile.dart
diff --git a/...ity_profile/get_all_quality_profiles.dart → ...ity_profile/get_all_quality_profiles.dart b/...ity_profile/get_all_quality_profiles.dart → ...ity_profile/get_all_quality_profiles.dart
diff --git a/...lity_profile/get_quality_definitions.dart → ...lity_profile/get_quality_definitions.dart b/...lity_profile/get_quality_definitions.dart → ...lity_profile/get_quality_definitions.dart
diff --git a/.../quality_profile/get_quality_profile.dart → .../quality_profile/get_quality_profile.dart b/.../quality_profile/get_quality_profile.dart → .../quality_profile/get_quality_profile.dart
diff --git a/...odules/radarr/api/src/commands/queue.dart → lib/api/radarr/src/commands/queue.dart b/...odules/radarr/api/src/commands/queue.dart → lib/api/radarr/src/commands/queue.dart
diff --git a/.../api/src/commands/queue/delete_queue.dart → ...darr/src/commands/queue/delete_queue.dart b/.../api/src/commands/queue/delete_queue.dart → ...darr/src/commands/queue/delete_queue.dart
diff --git a/...arr/api/src/commands/queue/get_queue.dart → .../radarr/src/commands/queue/get_queue.dart b/...arr/api/src/commands/queue/get_queue.dart → .../radarr/src/commands/queue/get_queue.dart
diff --git a/.../src/commands/queue/get_queue_status.dart → .../src/commands/queue/get_queue_status.dart b/.../src/commands/queue/get_queue_status.dart → .../src/commands/queue/get_queue_status.dart
diff --git a/...ules/radarr/api/src/commands/release.dart → lib/api/radarr/src/commands/release.dart b/...ules/radarr/api/src/commands/release.dart → lib/api/radarr/src/commands/release.dart
diff --git a/...pi/src/commands/release/get_releases.dart → ...rr/src/commands/release/get_releases.dart b/...pi/src/commands/release/get_releases.dart → ...rr/src/commands/release/get_releases.dart
diff --git a/...pi/src/commands/release/push_release.dart → ...rr/src/commands/release/push_release.dart b/...pi/src/commands/release/push_release.dart → ...rr/src/commands/release/push_release.dart
diff --git a/.../radarr/api/src/commands/root_folder.dart → lib/api/radarr/src/commands/root_folder.dart b/.../radarr/api/src/commands/root_folder.dart → lib/api/radarr/src/commands/root_folder.dart
diff --git a/...ommands/root_folder/get_root_folders.dart → ...ommands/root_folder/get_root_folders.dart b/...ommands/root_folder/get_root_folders.dart → ...ommands/root_folder/get_root_folders.dart
diff --git a/...dules/radarr/api/src/commands/system.dart → lib/api/radarr/src/commands/system.dart b/...dules/radarr/api/src/commands/system.dart → lib/api/radarr/src/commands/system.dart
diff --git a/...r/api/src/commands/system/get_status.dart → ...adarr/src/commands/system/get_status.dart b/...r/api/src/commands/system/get_status.dart → ...adarr/src/commands/system/get_status.dart
diff --git a/lib/modules/radarr/api/src/commands/tag.dart → lib/api/radarr/src/commands/tag.dart b/lib/modules/radarr/api/src/commands/tag.dart → lib/api/radarr/src/commands/tag.dart
diff --git a/.../radarr/api/src/commands/tag/add_tag.dart → lib/api/radarr/src/commands/tag/add_tag.dart b/.../radarr/api/src/commands/tag/add_tag.dart → lib/api/radarr/src/commands/tag/add_tag.dart
diff --git a/...darr/api/src/commands/tag/delete_tag.dart → ...i/radarr/src/commands/tag/delete_tag.dart b/...darr/api/src/commands/tag/delete_tag.dart → ...i/radarr/src/commands/tag/delete_tag.dart
diff --git a/...rr/api/src/commands/tag/get_all_tags.dart → ...radarr/src/commands/tag/get_all_tags.dart b/...rr/api/src/commands/tag/get_all_tags.dart → ...radarr/src/commands/tag/get_all_tags.dart
diff --git a/.../radarr/api/src/commands/tag/get_tag.dart → lib/api/radarr/src/commands/tag/get_tag.dart b/.../radarr/api/src/commands/tag/get_tag.dart → lib/api/radarr/src/commands/tag/get_tag.dart
diff --git a/...darr/api/src/commands/tag/update_tag.dart → ...i/radarr/src/commands/tag/update_tag.dart b/...darr/api/src/commands/tag/update_tag.dart → ...i/radarr/src/commands/tag/update_tag.dart
diff --git a/...adarr/api/src/models/command/command.dart → ...pi/radarr/src/models/command/command.dart b/...adarr/api/src/models/command/command.dart → ...pi/radarr/src/models/command/command.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/src/models/command/command_body.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/src/models/command/command_body.dart';
 
 part 'command.g.dart';
 

diff --git a/.../api/src/models/command/command_body.dart → ...darr/src/models/command/command_body.dart b/.../api/src/models/command/command_body.dart → ...darr/src/models/command/command_body.dart
diff --git a/...c/models/custom_format/custom_format.dart → ...c/models/custom_format/custom_format.dart b/...c/models/custom_format/custom_format.dart → ...c/models/custom_format/custom_format.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/src/models/custom_format/custom_format_specifications.dart';
+import 'package:lunasea/api/radarr/src/models/custom_format/custom_format_specifications.dart';
 
 part 'custom_format.g.dart';
 

diff --git a/..._format/custom_format_specifications.dart → ..._format/custom_format_specifications.dart b/..._format/custom_format_specifications.dart → ..._format/custom_format_specifications.dart
diff --git a/.../api/src/models/exclusions/exclusion.dart → ...darr/src/models/exclusions/exclusion.dart b/.../api/src/models/exclusions/exclusion.dart → ...darr/src/models/exclusions/exclusion.dart
diff --git a/.../api/src/models/extrafile/extra_file.dart → ...darr/src/models/extrafile/extra_file.dart b/.../api/src/models/extrafile/extra_file.dart → ...darr/src/models/extrafile/extra_file.dart
diff --git a/.../api/src/models/filesystem/directory.dart → ...darr/src/models/filesystem/directory.dart b/.../api/src/models/filesystem/directory.dart → ...darr/src/models/filesystem/directory.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
 
 part 'directory.g.dart';
 

diff --git a/...api/src/models/filesystem/disk_space.dart → ...arr/src/models/filesystem/disk_space.dart b/...api/src/models/filesystem/disk_space.dart → ...arr/src/models/filesystem/disk_space.dart
diff --git a/...adarr/api/src/models/filesystem/file.dart → ...pi/radarr/src/models/filesystem/file.dart b/...adarr/api/src/models/filesystem/file.dart → ...pi/radarr/src/models/filesystem/file.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
 
 part 'file.g.dart';
 

diff --git a/...api/src/models/filesystem/filesystem.dart → ...arr/src/models/filesystem/filesystem.dart b/...api/src/models/filesystem/filesystem.dart → ...arr/src/models/filesystem/filesystem.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'filesystem.g.dart';
 

diff --git a/...src/models/health_check/health_check.dart → ...src/models/health_check/health_check.dart b/...src/models/health_check/health_check.dart → ...src/models/health_check/health_check.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
 
 part 'health_check.g.dart';
 

diff --git a/...adarr/api/src/models/history/history.dart → ...pi/radarr/src/models/history/history.dart b/...adarr/api/src/models/history/history.dart → ...pi/radarr/src/models/history/history.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'history.g.dart';
 

diff --git a/...pi/src/models/history/history_record.dart → ...rr/src/models/history/history_record.dart b/...pi/src/models/history/history_record.dart → ...rr/src/models/history/history_record.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'history_record.g.dart';
 

diff --git a/...es/radarr/api/src/models/image/image.dart → lib/api/radarr/src/models/image/image.dart b/...es/radarr/api/src/models/image/image.dart → lib/api/radarr/src/models/image/image.dart
diff --git a/...i/src/models/import_list/import_list.dart → ...r/src/models/import_list/import_list.dart b/...i/src/models/import_list/import_list.dart → ...r/src/models/import_list/import_list.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
 
 part 'import_list.g.dart';
 

diff --git a/...c/models/manual_import/manual_import.dart → ...c/models/manual_import/manual_import.dart b/...c/models/manual_import/manual_import.dart → ...c/models/manual_import/manual_import.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'manual_import.g.dart';
 

diff --git a/...els/manual_import/manual_import_file.dart → ...els/manual_import/manual_import_file.dart b/...els/manual_import/manual_import_file.dart → ...els/manual_import/manual_import_file.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'manual_import_file.g.dart';
 

diff --git a/...anual_import/manual_import_rejection.dart → ...anual_import/manual_import_rejection.dart b/...anual_import/manual_import_rejection.dart → ...anual_import/manual_import_rejection.dart
diff --git a/...s/manual_import/manual_import_update.dart → ...s/manual_import/manual_import_update.dart b/...s/manual_import/manual_import_update.dart → ...s/manual_import/manual_import_update.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'manual_import_update.g.dart';
 

diff --git a/...ual_import/manual_import_update_data.dart → ...ual_import/manual_import_update_data.dart b/...ual_import/manual_import_update_data.dart → ...ual_import/manual_import_update_data.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'manual_import_update_data.g.dart';
 

diff --git a/...pi/src/models/movie/alternate_titles.dart → ...rr/src/models/movie/alternate_titles.dart b/...pi/src/models/movie/alternate_titles.dart → ...rr/src/models/movie/alternate_titles.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'alternate_titles.g.dart';
 

diff --git a/...darr/api/src/models/movie/collection.dart → ...i/radarr/src/models/movie/collection.dart b/...darr/api/src/models/movie/collection.dart → ...i/radarr/src/models/movie/collection.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'collection.g.dart';
 

diff --git a/.../radarr/api/src/models/movie/credits.dart → lib/api/radarr/src/models/movie/credits.dart b/.../radarr/api/src/models/movie/credits.dart → lib/api/radarr/src/models/movie/credits.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'credits.g.dart';
 

diff --git a/...es/radarr/api/src/models/movie/movie.dart → lib/api/radarr/src/models/movie/movie.dart b/...es/radarr/api/src/models/movie/movie.dart → lib/api/radarr/src/models/movie/movie.dart
diff --git a/...darr/api/src/models/movie/movie_file.dart → ...i/radarr/src/models/movie/movie_file.dart b/...darr/api/src/models/movie/movie_file.dart → ...i/radarr/src/models/movie/movie_file.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'movie_file.g.dart';
 

diff --git a/...c/models/movie/movie_file_media_info.dart → ...c/models/movie/movie_file_media_info.dart b/...c/models/movie/movie_file_media_info.dart → ...c/models/movie/movie_file_media_info.dart
diff --git a/.../src/models/movie/movie_file_quality.dart → .../src/models/movie/movie_file_quality.dart b/.../src/models/movie/movie_file_quality.dart → .../src/models/movie/movie_file_quality.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'movie_file_quality.g.dart';
 

diff --git a/...s/radarr/api/src/models/movie/rating.dart → lib/api/radarr/src/models/movie/rating.dart b/...s/radarr/api/src/models/movie/rating.dart → lib/api/radarr/src/models/movie/rating.dart
diff --git a/...c/models/quality_profile/format_item.dart → ...c/models/quality_profile/format_item.dart b/...c/models/quality_profile/format_item.dart → ...c/models/quality_profile/format_item.dart
diff --git a/.../api/src/models/quality_profile/item.dart → ...darr/src/models/quality_profile/item.dart b/.../api/src/models/quality_profile/item.dart → ...darr/src/models/quality_profile/item.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'item.g.dart';
 

diff --git a/.../src/models/quality_profile/language.dart → .../src/models/quality_profile/language.dart b/.../src/models/quality_profile/language.dart → .../src/models/quality_profile/language.dart
diff --git a/...i/src/models/quality_profile/quality.dart → ...r/src/models/quality_profile/quality.dart b/...i/src/models/quality_profile/quality.dart → ...r/src/models/quality_profile/quality.dart
diff --git a/...s/quality_profile/quality_definition.dart → ...s/quality_profile/quality_definition.dart b/...s/quality_profile/quality_definition.dart → ...s/quality_profile/quality_definition.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'quality_definition.g.dart';
 

diff --git a/...dels/quality_profile/quality_profile.dart → ...dels/quality_profile/quality_profile.dart b/...dels/quality_profile/quality_profile.dart → ...dels/quality_profile/quality_profile.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
+import 'package:lunasea/api/radarr/models.dart';
 
 part 'quality_profile.g.dart';
 

diff --git a/...els/quality_profile/quality_revision.dart → ...els/quality_profile/quality_revision.dart b/...els/quality_profile/quality_revision.dart → ...els/quality_profile/quality_revision.dart
diff --git a/...es/radarr/api/src/models/queue/queue.dart → lib/api/radarr/src/models/queue/queue.dart b/...es/radarr/api/src/models/queue/queue.dart → lib/api/radarr/src/models/queue/queue.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
 
 part 'queue.g.dart';
 

diff --git a/...rr/api/src/models/queue/queue_record.dart → ...radarr/src/models/queue/queue_record.dart b/...rr/api/src/models/queue/queue_record.dart → ...radarr/src/models/queue/queue_record.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
 
 part 'queue_record.g.dart';
 

diff --git a/...rr/api/src/models/queue/queue_status.dart → ...radarr/src/models/queue/queue_status.dart b/...rr/api/src/models/queue/queue_status.dart → ...radarr/src/models/queue/queue_status.dart
diff --git a/...rc/models/queue/queue_status_message.dart → ...rc/models/queue/queue_status_message.dart b/...rc/models/queue/queue_status_message.dart → ...rc/models/queue/queue_status_message.dart
diff --git a/...adarr/api/src/models/release/release.dart → ...pi/radarr/src/models/release/release.dart b/...adarr/api/src/models/release/release.dart → ...pi/radarr/src/models/release/release.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/utilities.dart';
-import 'package:lunasea/modules/radarr/api/models.dart';
-import 'package:lunasea/modules/radarr/api/types.dart';
+import 'package:lunasea/api/radarr/utilities.dart';
+import 'package:lunasea/api/radarr/models.dart';
+import 'package:lunasea/api/radarr/types.dart';
 
 part 'release.g.dart';
 

diff --git a/...i/src/models/root_folder/root_folder.dart → ...r/src/models/root_folder/root_folder.dart b/...i/src/models/root_folder/root_folder.dart → ...r/src/models/root_folder/root_folder.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:lunasea/modules/radarr/api/src/models/root_folder/unmapped_folder.dart';
+import 'package:lunasea/api/radarr/src/models/root_folder/unmapped_folder.dart';
 
 part 'root_folder.g.dart';
 

diff --git a/...c/models/root_folder/unmapped_folder.dart → ...c/models/root_folder/unmapped_folder.dart b/...c/models/root_folder/unmapped_folder.dart → ...c/models/root_folder/unmapped_folder.dart
diff --git a/.../radarr/api/src/models/system/status.dart → lib/api/radarr/src/models/system/status.dart b/.../radarr/api/src/models/system/status.dart → lib/api/radarr/src/models/system/status.dart
diff --git a/...odules/radarr/api/src/models/tag/tag.dart → lib/api/radarr/src/models/tag/tag.dart b/...odules/radarr/api/src/models/tag/tag.dart → lib/api/radarr/src/models/tag/tag.dart
diff --git a/...es/radarr/api/src/types/availability.dart → lib/api/radarr/src/types/availability.dart b/...es/radarr/api/src/types/availability.dart → lib/api/radarr/src/types/availability.dart
diff --git a/...les/radarr/api/src/types/credit_type.dart → lib/api/radarr/src/types/credit_type.dart b/...les/radarr/api/src/types/credit_type.dart → lib/api/radarr/src/types/credit_type.dart
diff --git a/...ules/radarr/api/src/types/event_type.dart → lib/api/radarr/src/types/event_type.dart b/...ules/radarr/api/src/types/event_type.dart → lib/api/radarr/src/types/event_type.dart
diff --git a/...radarr/api/src/types/filesystem_type.dart → ...api/radarr/src/types/filesystem_type.dart b/...radarr/api/src/types/filesystem_type.dart → ...api/radarr/src/types/filesystem_type.dart
diff --git a/...darr/api/src/types/health_check_type.dart → ...i/radarr/src/types/health_check_type.dart b/...darr/api/src/types/health_check_type.dart → ...i/radarr/src/types/health_check_type.dart
diff --git a/...adarr/api/src/types/history_sort_key.dart → ...pi/radarr/src/types/history_sort_key.dart b/...adarr/api/src/types/history_sort_key.dart → ...pi/radarr/src/types/history_sort_key.dart
diff --git a/...les/radarr/api/src/types/import_mode.dart → lib/api/radarr/src/types/import_mode.dart b/...les/radarr/api/src/types/import_mode.dart → lib/api/radarr/src/types/import_mode.dart
diff --git a/...s/radarr/api/src/types/protocol_type.dart → lib/api/radarr/src/types/protocol_type.dart b/...s/radarr/api/src/types/protocol_type.dart → lib/api/radarr/src/types/protocol_type.dart
diff --git a/...rr/api/src/types/queue_record_status.dart → ...radarr/src/types/queue_record_status.dart b/...rr/api/src/types/queue_record_status.dart → ...radarr/src/types/queue_record_status.dart
diff --git a/.../radarr/api/src/types/queue_sort_key.dart → lib/api/radarr/src/types/queue_sort_key.dart b/.../radarr/api/src/types/queue_sort_key.dart → lib/api/radarr/src/types/queue_sort_key.dart
diff --git a/.../radarr/api/src/types/sort_direction.dart → lib/api/radarr/src/types/sort_direction.dart b/.../radarr/api/src/types/sort_direction.dart → lib/api/radarr/src/types/sort_direction.dart
diff --git a/...api/src/types/tracked_download_state.dart → ...arr/src/types/tracked_download_state.dart b/...api/src/types/tracked_download_state.dart → ...arr/src/types/tracked_download_state.dart
diff --git a/...pi/src/types/tracked_download_status.dart → ...rr/src/types/tracked_download_status.dart b/...pi/src/types/tracked_download_status.dart → ...rr/src/types/tracked_download_status.dart
diff --git a/lib/modules/radarr/api/types.dart → lib/api/radarr/types.dart b/lib/modules/radarr/api/types.dart → lib/api/radarr/types.dart
diff --git a/lib/modules/radarr/api/utilities.dart → lib/api/radarr/utilities.dart b/lib/modules/radarr/api/utilities.dart → lib/api/radarr/utilities.dart
@@ -1,7 +1,7 @@
 /// Library containing all utility functions for Radarr data.
 library radarr_utilities;
 
-import 'package:lunasea/modules/radarr/api/types.dart';
+import 'package:lunasea/api/radarr/types.dart';
 
 /// [RadarrUtilities] gives access to static, functional operations. These are mainly used for the (de)serialization of received JSON data.
 ///

diff --git a/lib/modules/sonarr/api/controllers.dart → lib/api/sonarr/controllers.dart b/lib/modules/sonarr/api/controllers.dart → lib/api/sonarr/controllers.dart
@@ -1,10 +1,10 @@
 /// Library containing all logic and accessors to make calls to Sonarr's API.
 library sonarr_commands;
 
-import 'package:lunasea/modules/sonarr/api/types.dart';
+import 'package:lunasea/api/sonarr/models.dart';
+import 'package:lunasea/api/sonarr/types.dart';
 import 'package:dio/dio.dart';
 import 'package:intl/intl.dart';
-import 'package:lunasea/modules/sonarr/api/models.dart';
 
 // Calendar
 part 'src/controllers/calendar.dart';

diff --git a/lib/modules/sonarr/api/models.dart → lib/api/sonarr/models.dart b/lib/modules/sonarr/api/models.dart → lib/api/sonarr/models.dart