refactor: simplify file structure

lib/mixins/item_updatable.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../models/plex_metadata.dart';
 
 /// Mixin for screens that need to update individual items after watch state changes

lib/mixins/library_tab_state.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../models/plex_library.dart';
 import '../utils/provider_extensions.dart';
 

lib/mpv/mpv.dart

@@ -44,19 +44,19 @@
 library;
 
 // Player
-export 'src/player/player.dart';
-export 'src/player/player_state.dart';
-export 'src/player/player_streams.dart';
+export 'player/player.dart';
+export 'player/player_state.dart';
+export 'player/player_streams.dart';
 
 // Models
-export 'src/models/media.dart';
-export 'src/models/audio_device.dart';
-export 'src/models/audio_track.dart';
-export 'src/models/subtitle_track.dart';
-export 'src/models/tracks.dart';
-export 'src/models/track_selection.dart';
-export 'src/models/player_log.dart';
-export 'src/models/player_log_level.dart';
+export 'models/media.dart';
+export 'models/audio_device.dart';
+export 'models/audio_track.dart';
+export 'models/subtitle_track.dart';
+export 'models/tracks.dart';
+export 'models/track_selection.dart';
+export 'models/player_log.dart';
+export 'models/player_log_level.dart';
 
 // Video
-export 'src/video/video.dart';
+export 'video/video.dart';

lib/providers/multi_server_provider.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../services/data_aggregation_service.dart';
 import '../services/multi_server_manager.dart';
 import '../services/plex_auth_service.dart';

lib/providers/playback_state_provider.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import '../models/plex_metadata.dart';
 import '../models/play_queue_response.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 
 /// Playback mode types
 ///

lib/providers/plex_client_provider.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../utils/app_logger.dart';
 
 class PlexClientProvider extends ChangeNotifier {

lib/screens/base_media_list_detail_screen.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../providers/multi_server_provider.dart';
 import '../utils/provider_extensions.dart';

lib/screens/discover_screen.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../utils/plex_image_helper.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_hub.dart';

lib/screens/hub_detail_screen.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_hub.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_sort.dart';

lib/screens/libraries_screen.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:dio/dio.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_library.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_sort.dart';

lib/screens/library_tabs/library_browse_tab.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:dio/dio.dart';
-import '../../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../../models/plex_library.dart';
 import '../../models/plex_metadata.dart';
 import '../../models/plex_filter.dart';

lib/screens/library_tabs/library_recommended_tab.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../../i18n/strings.g.dart';
 import '../../mixins/item_updatable.dart';
 import '../../models/plex_hub.dart';

lib/screens/main_screen.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../i18n/strings.g.dart';
 import '../utils/app_logger.dart';
 import '../utils/keyboard_utils.dart';

lib/screens/media_detail_screen.dart

@@ -7,7 +7,7 @@ import '../widgets/plex_optimized_image.dart';
 import '../utils/plex_image_helper.dart';
 import '../mixins/keyboard_long_press_mixin.dart';
 import '../widgets/focus/focus_indicator.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../providers/playback_state_provider.dart';
 import '../theme/theme_helper.dart';

lib/screens/playlist_detail_screen.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_playlist.dart';
 import '../models/plex_metadata.dart';
 import '../providers/settings_provider.dart';

lib/screens/season_detail_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../widgets/plex_optimized_image.dart';
 import '../widgets/focus/focus_indicator.dart';
 import '../models/plex_metadata.dart';

lib/screens/video_player_screen.dart

@@ -8,7 +8,7 @@ import 'package:provider/provider.dart';
 
 import '../mpv/mpv.dart';
 
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_media_version.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_media_info.dart';

lib/services/data_aggregation_service.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_hub.dart';
 import '../models/plex_library.dart';
 import '../models/plex_metadata.dart';

lib/services/episode_navigation_service.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import '../mpv/mpv.dart';
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../providers/playback_state_provider.dart';
 import '../utils/app_logger.dart';

lib/services/media_controls_manager.dart

@@ -1,7 +1,7 @@
 import 'package:os_media_controls/os_media_controls.dart';
 import 'package:rate_limiter/rate_limiter.dart';
 
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../utils/app_logger.dart';
 

lib/services/multi_server_manager.dart

@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 
-import '../client/plex_client.dart';
-import '../config/plex_config.dart';
+import 'plex_client.dart';
+import '../models/plex_config.dart';
 import '../utils/app_logger.dart';
 import 'plex_auth_service.dart';
 import 'storage_service.dart';

lib/services/playback_initialization_service.dart

@@ -1,4 +1,4 @@
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_media_info.dart';
 import '../models/plex_metadata.dart';
 import '../mpv/mpv.dart';

lib/services/playback_progress_tracker.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import '../mpv/mpv.dart';
 
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../utils/app_logger.dart';
 

lib/services/plex_auth_service.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'package:dio/dio.dart';
 import 'package:uuid/uuid.dart';
 import 'storage_service.dart';
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_user_profile.dart';
 import '../models/plex_home.dart';
 import '../models/user_switch_response.dart';

lib/services/plex_client.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:dio/dio.dart';
 
-import '../config/plex_config.dart';
+import '../models/plex_config.dart';
 import '../models/play_queue_response.dart';
 import '../models/plex_file_info.dart';
 import '../models/plex_filter.dart';
@@ -14,7 +14,7 @@ import '../models/plex_metadata.dart';
 import '../models/plex_playlist.dart';
 import '../models/plex_sort.dart';
 import '../models/plex_video_playback_data.dart';
-import '../network/endpoint_failover_interceptor.dart';
+import '../utils/endpoint_failover_interceptor.dart';
 import '../utils/app_logger.dart';
 import '../utils/log_redaction_manager.dart';
 

lib/utils/collection_playlist_play_helper.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_playlist.dart';
 import '../models/play_queue_response.dart';

lib/utils/grid_size_calculator.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import '../services/settings_service.dart' show LibraryDensity;
-import '../constants/layout_constants.dart';
+import 'layout_constants.dart';
 
 /// Utility class for calculating consistent grid sizes across the app
 class GridSizeCalculator {

lib/utils/plex_image_helper.dart

@@ -1,5 +1,5 @@
 import 'dart:math';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 
 /// Image types for different transcoding strategies
 enum ImageType {

lib/utils/provider_extensions.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../i18n/strings.g.dart';
 import '../models/plex_library.dart';
 import '../models/plex_user_profile.dart';

lib/widgets/media_card.dart

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'focus/focus_indicator.dart';
 import 'hub_navigation_controller.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../mixins/keyboard_long_press_mixin.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_playlist.dart';

lib/widgets/media_context_menu.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_playlist.dart';
 import '../providers/multi_server_provider.dart';

lib/widgets/playlist_item_card.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../mixins/keyboard_long_press_mixin.dart';
 import '../models/plex_metadata.dart';
 import '../utils/duration_formatter.dart';

lib/widgets/plex_optimized_image.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../utils/plex_image_helper.dart';
 import 'media_card.dart';
 

lib/widgets/video_controls/sheets/chapter_sheet.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../mpv/mpv.dart';
-import '../../../client/plex_client.dart';
+import '../../../services/plex_client.dart';
 import '../../../models/plex_media_info.dart';
 import '../../../utils/duration_formatter.dart';
 import '../../../utils/provider_extensions.dart';

lib/widgets/video_controls/video_controls.dart

@@ -9,7 +9,7 @@ import 'package:window_manager/window_manager.dart';
 
 import '../../mpv/mpv.dart';
 
-import '../../client/plex_client.dart';
+import '../../services/plex_client.dart';
 import '../../models/plex_media_info.dart';
 import '../../models/plex_media_version.dart';
 import '../../models/plex_metadata.dart';