diff --git a/fastanime/cli/cli.py b/fastanime/cli/cli.py
index f6aff95..f0f5b83 100644
--- a/fastanime/cli/cli.py
+++ b/fastanime/cli/cli.py
@@ -7,7 +7,7 @@ from ..core.config import AppConfig
 from ..core.constants import PROJECT_NAME, USER_CONFIG_PATH, __version__
 from .config import ConfigLoader
 from .options import options_from_model
-from .utils.exceptions import setup_exceptions_handler
+from .utils.exception import setup_exceptions_handler
 from .utils.lazyloader import LazyGroup
 from .utils.logging import setup_logging
 
diff --git a/fastanime/cli/commands/anilist/commands/search.py b/fastanime/cli/commands/anilist/commands/search.py
index 11a59c0..6b8e57b 100644
--- a/fastanime/cli/commands/anilist/commands/search.py
+++ b/fastanime/cli/commands/anilist/commands/search.py
@@ -2,7 +2,7 @@ from typing import TYPE_CHECKING
 
 import click
 
-from fastanime.cli.utils.completions import anime_titles_shell_complete
+from fastanime.cli.utils.completion import anime_titles_shell_complete
 
 from .data import (
     genres_available,
diff --git a/fastanime/cli/commands/download.py b/fastanime/cli/commands/download.py
index 803891c..e512ca3 100644
--- a/fastanime/cli/commands/download.py
+++ b/fastanime/cli/commands/download.py
@@ -4,7 +4,7 @@ import click
 
 from ...core.config import AppConfig
 from ...core.exceptions import FastAnimeError
-from ..utils.completions import anime_titles_shell_complete
+from ..utils.completion import anime_titles_shell_complete
 from . import examples
 
 if TYPE_CHECKING:
@@ -13,8 +13,8 @@ if TYPE_CHECKING:
 
     from typing_extensions import Unpack
 
-    from ...libs.providers.anime.base import BaseAnimeProvider
-    from ...libs.providers.anime.types import Anime
+    from ...libs.provider.anime.base import BaseAnimeProvider
+    from ...libs.provider.anime.types import Anime
     from ...libs.selectors.base import BaseSelector
 
     class Options(TypedDict):
@@ -106,11 +106,11 @@ def download(config: AppConfig, **options: "Unpack[Options]"):
     from rich.progress import Progress
 
     from ...core.exceptions import FastAnimeError
-    from ...libs.providers.anime.params import (
+    from ...libs.provider.anime.params import (
         AnimeParams,
         SearchParams,
     )
-    from ...libs.providers.anime.provider import create_provider
+    from ...libs.provider.anime.provider import create_provider
     from ...libs.selectors.selector import create_selector
 
     provider = create_provider(config.general.provider)
@@ -208,7 +208,7 @@ def download_anime(
     from rich.progress import Progress
 
     from ...core.downloader import DownloadParams, create_downloader
-    from ...libs.providers.anime.params import EpisodeStreamsParams
+    from ...libs.provider.anime.params import EpisodeStreamsParams
 
     downloader = create_downloader(config.downloads)
 
diff --git a/fastanime/cli/commands/search.py b/fastanime/cli/commands/search.py
index 7b06b1a..06e93c7 100644
--- a/fastanime/cli/commands/search.py
+++ b/fastanime/cli/commands/search.py
@@ -4,7 +4,7 @@ import click
 
 from ...core.config import AppConfig
 from ...core.exceptions import FastAnimeError
-from ..utils.completions import anime_titles_shell_complete
+from ..utils.completion import anime_titles_shell_complete
 from . import examples
 
 if TYPE_CHECKING:
@@ -12,8 +12,8 @@ if TYPE_CHECKING:
 
     from typing_extensions import Unpack
 
-    from ...libs.providers.anime.base import BaseAnimeProvider
-    from ...libs.providers.anime.types import Anime
+    from ...libs.provider.anime.base import BaseAnimeProvider
+    from ...libs.provider.anime.types import Anime
     from ...libs.selectors.base import BaseSelector
 
     class Options(TypedDict):
@@ -45,11 +45,11 @@ def search(config: AppConfig, **options: "Unpack[Options]"):
     from rich.progress import Progress
 
     from ...core.exceptions import FastAnimeError
-    from ...libs.providers.anime.params import (
+    from ...libs.provider.anime.params import (
         AnimeParams,
         SearchParams,
     )
-    from ...libs.providers.anime.provider import create_provider
+    from ...libs.provider.anime.provider import create_provider
     from ...libs.selectors.selector import create_selector
 
     provider = create_provider(config.general.provider)
@@ -141,9 +141,9 @@ def stream_anime(
     from rich import print
     from rich.progress import Progress
 
-    from ...libs.players.params import PlayerParams
-    from ...libs.players.player import create_player
-    from ...libs.providers.anime.params import EpisodeStreamsParams
+    from ...libs.player.params import PlayerParams
+    from ...libs.player.player import create_player
+    from ...libs.provider.anime.params import EpisodeStreamsParams
 
     player = create_player(config)
 
diff --git a/fastanime/cli/interactive/menus/media/episodes.py b/fastanime/cli/interactive/menu/media/episodes.py
similarity index 97%
rename from fastanime/cli/interactive/menus/media/episodes.py
rename to fastanime/cli/interactive/menu/media/episodes.py
index 18b4eab..56a1921 100644
--- a/fastanime/cli/interactive/menus/media/episodes.py
+++ b/fastanime/cli/interactive/menu/media/episodes.py
@@ -39,7 +39,7 @@ def episodes(ctx: Context, state: State) -> State | InternalDirective:
 
         preview_command = None
         if ctx.config.general.preview != "none":
-            from ....utils.previews import get_episode_preview
+            from ....utils.preview import get_episode_preview
 
             preview_command = get_episode_preview(
                 available_episodes, media_item, ctx.config
diff --git a/fastanime/cli/interactive/menus/media/main.py b/fastanime/cli/interactive/menu/media/main.py
similarity index 100%
rename from fastanime/cli/interactive/menus/media/main.py
rename to fastanime/cli/interactive/menu/media/main.py
diff --git a/fastanime/cli/interactive/menus/media/media_actions.py b/fastanime/cli/interactive/menu/media/media_actions.py
similarity index 99%
rename from fastanime/cli/interactive/menus/media/media_actions.py
rename to fastanime/cli/interactive/menu/media/media_actions.py
index 6f2d52b..557fd04 100644
--- a/fastanime/cli/interactive/menus/media/media_actions.py
+++ b/fastanime/cli/interactive/menu/media/media_actions.py
@@ -4,7 +4,7 @@ from rich.console import Console
 
 from .....libs.media_api.params import UpdateUserMediaListEntryParams
 from .....libs.media_api.types import UserMediaListStatus
-from .....libs.players.params import PlayerParams
+from .....libs.player.params import PlayerParams
 from ...session import Context, session
 from ...state import InternalDirective, MenuName, State
 
diff --git a/fastanime/cli/interactive/menus/media/player_controls.py b/fastanime/cli/interactive/menu/media/player_controls.py
similarity index 100%
rename from fastanime/cli/interactive/menus/media/player_controls.py
rename to fastanime/cli/interactive/menu/media/player_controls.py
diff --git a/fastanime/cli/interactive/menus/media/provider_search.py b/fastanime/cli/interactive/menu/media/provider_search.py
similarity index 94%
rename from fastanime/cli/interactive/menus/media/provider_search.py
rename to fastanime/cli/interactive/menu/media/provider_search.py
index 88ddbf3..1e72619 100644
--- a/fastanime/cli/interactive/menus/media/provider_search.py
+++ b/fastanime/cli/interactive/menu/media/provider_search.py
@@ -1,8 +1,8 @@
 from rich.progress import Progress
 from thefuzz import fuzz
 
-from .....libs.providers.anime.params import SearchParams
-from .....libs.providers.anime.types import SearchResult
+from .....libs.provider.anime.params import SearchParams
+from .....libs.provider.anime.types import SearchResult
 from ...session import Context, session
 from ...state import InternalDirective, MenuName, ProviderState, State
 
@@ -73,7 +73,7 @@ def provider_search(ctx: Context, state: State) -> State | InternalDirective:
             f"[cyan]Fetching full details for '{selected_provider_anime.title}'...",
             total=None,
         )
-        from .....libs.providers.anime.params import AnimeParams
+        from .....libs.provider.anime.params import AnimeParams
 
         full_provider_anime = provider.get(
             AnimeParams(id=selected_provider_anime.id, query=media_title.lower())
diff --git a/fastanime/cli/interactive/menus/media/results.py b/fastanime/cli/interactive/menu/media/results.py
similarity index 99%
rename from fastanime/cli/interactive/menus/media/results.py
rename to fastanime/cli/interactive/menu/media/results.py
index 76983bf..5b24124 100644
--- a/fastanime/cli/interactive/menus/media/results.py
+++ b/fastanime/cli/interactive/menu/media/results.py
@@ -26,7 +26,7 @@ def results(ctx: Context, state: State) -> State | InternalDirective:
 
     preview_command = None
     if ctx.config.general.preview != "none":
-        from ....utils.previews import get_anime_preview
+        from ....utils.preview import get_anime_preview
 
         preview_command = get_anime_preview(
             list(search_result_dict.values()),
diff --git a/fastanime/cli/interactive/menus/media/servers.py b/fastanime/cli/interactive/menu/media/servers.py
similarity index 95%
rename from fastanime/cli/interactive/menus/media/servers.py
rename to fastanime/cli/interactive/menu/media/servers.py
index fa2f02d..0462cc6 100644
--- a/fastanime/cli/interactive/menus/media/servers.py
+++ b/fastanime/cli/interactive/menu/media/servers.py
@@ -1,8 +1,8 @@
 from typing import Dict, List
 
-from .....libs.players.params import PlayerParams
-from .....libs.providers.anime.params import EpisodeStreamsParams
-from .....libs.providers.anime.types import ProviderServer, Server
+from .....libs.player.params import PlayerParams
+from .....libs.provider.anime.params import EpisodeStreamsParams
+from .....libs.provider.anime.types import ProviderServer, Server
 from ...session import Context, session
 from ...state import InternalDirective, MenuName, State
 
diff --git a/fastanime/cli/interactive/menus/share/auth.py b/fastanime/cli/interactive/menu/share/auth.py
similarity index 100%
rename from fastanime/cli/interactive/menus/share/auth.py
rename to fastanime/cli/interactive/menu/share/auth.py
diff --git a/fastanime/cli/interactive/menus/share/session_management.py b/fastanime/cli/interactive/menu/share/session_management.py
similarity index 100%
rename from fastanime/cli/interactive/menus/share/session_management.py
rename to fastanime/cli/interactive/menu/share/session_management.py
diff --git a/fastanime/cli/interactive/menus/share/user_media_list.py b/fastanime/cli/interactive/menu/share/user_media_list.py
similarity index 100%
rename from fastanime/cli/interactive/menus/share/user_media_list.py
rename to fastanime/cli/interactive/menu/share/user_media_list.py
diff --git a/fastanime/cli/interactive/menus/share/watch_history.py b/fastanime/cli/interactive/menu/share/watch_history.py
similarity index 100%
rename from fastanime/cli/interactive/menus/share/watch_history.py
rename to fastanime/cli/interactive/menu/share/watch_history.py
diff --git a/fastanime/cli/interactive/session.py b/fastanime/cli/interactive/session.py
index 3cf488c..187b404 100644
--- a/fastanime/cli/interactive/session.py
+++ b/fastanime/cli/interactive/session.py
@@ -9,8 +9,8 @@ import click
 from ...core.config import AppConfig
 from ...core.constants import APP_DIR, USER_CONFIG_PATH
 from ...libs.media_api.base import BaseApiClient
-from ...libs.players.base import BasePlayer
-from ...libs.providers.anime.base import BaseAnimeProvider
+from ...libs.player.base import BasePlayer
+from ...libs.provider.anime.base import BaseAnimeProvider
 from ...libs.selectors.base import BaseSelector
 from ..services.auth import AuthService
 from ..services.feedback import FeedbackService
@@ -62,8 +62,8 @@ class Session:
     def _load_context(self, config: AppConfig):
         """Initializes all shared services based on the provided configuration."""
         from ...libs.media_api.api import create_api_client
-        from ...libs.players import create_player
-        from ...libs.providers.anime.provider import create_provider
+        from ...libs.player import create_player
+        from ...libs.provider.anime.provider import create_provider
         from ...libs.selectors import create_selector
 
         media_registry = MediaRegistryService(
diff --git a/fastanime/cli/interactive/state.py b/fastanime/cli/interactive/state.py
index c750401..7bcc82f 100644
--- a/fastanime/cli/interactive/state.py
+++ b/fastanime/cli/interactive/state.py
@@ -5,7 +5,7 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from ...libs.media_api.params import MediaSearchParams, UserMediaListSearchParams
 from ...libs.media_api.types import MediaItem, PageInfo
-from ...libs.providers.anime.types import Anime, SearchResults, Server
+from ...libs.provider.anime.types import Anime, SearchResults, Server
 
 
 # TODO: is internal directive a good name
diff --git a/fastanime/cli/services/auth/__init__.py b/fastanime/cli/service/auth/__init__.py
similarity index 100%
rename from fastanime/cli/services/auth/__init__.py
rename to fastanime/cli/service/auth/__init__.py
diff --git a/fastanime/cli/services/auth/model.py b/fastanime/cli/service/auth/model.py
similarity index 100%
rename from fastanime/cli/services/auth/model.py
rename to fastanime/cli/service/auth/model.py
diff --git a/fastanime/cli/services/auth/service.py b/fastanime/cli/service/auth/service.py
similarity index 100%
rename from fastanime/cli/services/auth/service.py
rename to fastanime/cli/service/auth/service.py
diff --git a/fastanime/cli/services/downloads/__init__.py b/fastanime/cli/service/downloads/__init__.py
similarity index 100%
rename from fastanime/cli/services/downloads/__init__.py
rename to fastanime/cli/service/downloads/__init__.py
diff --git a/fastanime/cli/services/downloads/manager.py b/fastanime/cli/service/downloads/manager.py
similarity index 100%
rename from fastanime/cli/services/downloads/manager.py
rename to fastanime/cli/service/downloads/manager.py
diff --git a/fastanime/cli/services/downloads/service.py b/fastanime/cli/service/downloads/service.py
similarity index 100%
rename from fastanime/cli/services/downloads/service.py
rename to fastanime/cli/service/downloads/service.py
diff --git a/fastanime/cli/services/feedback/__init__.py b/fastanime/cli/service/feedback/__init__.py
similarity index 100%
rename from fastanime/cli/services/feedback/__init__.py
rename to fastanime/cli/service/feedback/__init__.py
diff --git a/fastanime/cli/services/feedback/service.py b/fastanime/cli/service/feedback/service.py
similarity index 100%
rename from fastanime/cli/services/feedback/service.py
rename to fastanime/cli/service/feedback/service.py
diff --git a/fastanime/cli/services/registry/__init__.py b/fastanime/cli/service/registry/__init__.py
similarity index 100%
rename from fastanime/cli/services/registry/__init__.py
rename to fastanime/cli/service/registry/__init__.py
diff --git a/fastanime/cli/services/registry/filters.py b/fastanime/cli/service/registry/filters.py
similarity index 100%
rename from fastanime/cli/services/registry/filters.py
rename to fastanime/cli/service/registry/filters.py
diff --git a/fastanime/cli/services/registry/models.py b/fastanime/cli/service/registry/models.py
similarity index 94%
rename from fastanime/cli/services/registry/models.py
rename to fastanime/cli/service/registry/models.py
index a0d7b62..e76020e 100644
--- a/fastanime/cli/services/registry/models.py
+++ b/fastanime/cli/service/registry/models.py
@@ -7,7 +7,7 @@ from typing import Dict, Literal, Optional
 from pydantic import BaseModel, Field, computed_field
 
 from ....libs.media_api.types import MediaItem, UserMediaListStatus
-from ....core.utils import converters
+from ....core.utils import converter
 
 logger = logging.getLogger(__name__)
 
@@ -64,8 +64,8 @@ class MediaRegistryIndexEntry(BaseModel):
         """Watch completion percentage."""
         if self.total_duration and self.last_watch_position:
             return (
-                converters.time_to_seconds(self.last_watch_position)
-                / converters.time_to_seconds(self.total_duration)
+                converter.time_to_seconds(self.last_watch_position)
+                / converter.time_to_seconds(self.total_duration)
             ) * 100
         return 0.0
 
diff --git a/fastanime/cli/services/registry/service.py b/fastanime/cli/service/registry/service.py
similarity index 100%
rename from fastanime/cli/services/registry/service.py
rename to fastanime/cli/service/registry/service.py
diff --git a/fastanime/cli/services/session/__init__.py b/fastanime/cli/service/session/__init__.py
similarity index 100%
rename from fastanime/cli/services/session/__init__.py
rename to fastanime/cli/service/session/__init__.py
diff --git a/fastanime/cli/services/session/model.py b/fastanime/cli/service/session/model.py
similarity index 100%
rename from fastanime/cli/services/session/model.py
rename to fastanime/cli/service/session/model.py
diff --git a/fastanime/cli/services/session/service.py b/fastanime/cli/service/session/service.py
similarity index 100%
rename from fastanime/cli/services/session/service.py
rename to fastanime/cli/service/session/service.py
diff --git a/fastanime/cli/services/watch_history/__init__.py b/fastanime/cli/service/watch_history/__init__.py
similarity index 100%
rename from fastanime/cli/services/watch_history/__init__.py
rename to fastanime/cli/service/watch_history/__init__.py
diff --git a/fastanime/cli/services/watch_history/service.py b/fastanime/cli/service/watch_history/service.py
similarity index 97%
rename from fastanime/cli/services/watch_history/service.py
rename to fastanime/cli/service/watch_history/service.py
index 4661b62..b44fb86 100644
--- a/fastanime/cli/services/watch_history/service.py
+++ b/fastanime/cli/service/watch_history/service.py
@@ -5,7 +5,7 @@ from ....core.config.model import AppConfig
 from ....libs.media_api.base import BaseApiClient
 from ....libs.media_api.params import UpdateUserMediaListEntryParams
 from ....libs.media_api.types import MediaItem, UserMediaListStatus
-from ....libs.players.types import PlayerResult
+from ....libs.player.types import PlayerResult
 from ..registry import MediaRegistryService
 
 logger = logging.getLogger(__name__)
diff --git a/fastanime/cli/utils/completions.py b/fastanime/cli/utils/completion.py
similarity index 100%
rename from fastanime/cli/utils/completions.py
rename to fastanime/cli/utils/completion.py
diff --git a/fastanime/cli/utils/exceptions.py b/fastanime/cli/utils/exception.py
similarity index 100%
rename from fastanime/cli/utils/exceptions.py
rename to fastanime/cli/utils/exception.py
diff --git a/fastanime/cli/utils/previews.py b/fastanime/cli/utils/preview.py
similarity index 80%
rename from fastanime/cli/utils/previews.py
rename to fastanime/cli/utils/preview.py
index 39862a4..c96192b 100644
--- a/fastanime/cli/utils/previews.py
+++ b/fastanime/cli/utils/preview.py
@@ -9,7 +9,7 @@ from typing import List
 
 import httpx
 
-from ...core.utils import formatters
+from ...core.utils import formatter
 
 from ...core.config import AppConfig
 from ...core.constants import APP_CACHE_DIR, PLATFORM, SCRIPTS_DIR
@@ -102,64 +102,64 @@ def _populate_info_template(media_item: MediaItem, config: AppConfig) -> str:
     Takes the info.sh template and injects formatted, shell-safe data.
     """
     info_script = TEMPLATE_INFO_SCRIPT
-    description = formatters.clean_html(
+    description = formatter.clean_html(
         media_item.description or "No description available."
     )
 
     # Escape all variables before injecting them into the script
     replacements = {
-        "TITLE": formatters.shell_safe(
+        "TITLE": formatter.shell_safe(
             media_item.title.english or media_item.title.romaji
         ),
-        "STATUS": formatters.shell_safe(media_item.status.value),
-        "FORMAT": formatters.shell_safe(media_item.format.value),
-        "NEXT_EPISODE": formatters.shell_safe(
-            f"Episode {media_item.next_airing.episode} on {formatters.format_date(media_item.next_airing.airing_at, '%A, %d %B %Y at %X)')}"
+        "STATUS": formatter.shell_safe(media_item.status.value),
+        "FORMAT": formatter.shell_safe(media_item.format.value),
+        "NEXT_EPISODE": formatter.shell_safe(
+            f"Episode {media_item.next_airing.episode} on {formatter.format_date(media_item.next_airing.airing_at, '%A, %d %B %Y at %X)')}"
             if media_item.next_airing
             else "N/A"
         ),
-        "EPISODES": formatters.shell_safe(str(media_item.episodes)),
-        "DURATION": formatters.shell_safe(
-            formatters.format_media_duration(media_item.duration)
+        "EPISODES": formatter.shell_safe(str(media_item.episodes)),
+        "DURATION": formatter.shell_safe(
+            formatter.format_media_duration(media_item.duration)
         ),
-        "SCORE": formatters.shell_safe(
-            formatters.format_score_stars_full(media_item.average_score)
+        "SCORE": formatter.shell_safe(
+            formatter.format_score_stars_full(media_item.average_score)
         ),
-        "FAVOURITES": formatters.shell_safe(
-            formatters.format_number_with_commas(media_item.favourites)
+        "FAVOURITES": formatter.shell_safe(
+            formatter.format_number_with_commas(media_item.favourites)
         ),
-        "POPULARITY": formatters.shell_safe(
-            formatters.format_number_with_commas(media_item.popularity)
+        "POPULARITY": formatter.shell_safe(
+            formatter.format_number_with_commas(media_item.popularity)
         ),
-        "GENRES": formatters.shell_safe(
-            formatters.format_list_with_commas([v.value for v in media_item.genres])
+        "GENRES": formatter.shell_safe(
+            formatter.format_list_with_commas([v.value for v in media_item.genres])
         ),
-        "TAGS": formatters.shell_safe(
-            formatters.format_list_with_commas([t.name.value for t in media_item.tags])
+        "TAGS": formatter.shell_safe(
+            formatter.format_list_with_commas([t.name.value for t in media_item.tags])
         ),
-        "STUDIOS": formatters.shell_safe(
-            formatters.format_list_with_commas(
+        "STUDIOS": formatter.shell_safe(
+            formatter.format_list_with_commas(
                 [t.name for t in media_item.studios if t.name]
             )
         ),
-        "SYNONYMNS": formatters.shell_safe(
-            formatters.format_list_with_commas(media_item.synonymns)
+        "SYNONYMNS": formatter.shell_safe(
+            formatter.format_list_with_commas(media_item.synonymns)
         ),
-        "USER_STATUS": formatters.shell_safe(
+        "USER_STATUS": formatter.shell_safe(
             media_item.user_status.status.value
             if media_item.user_status and media_item.user_status.status
             else "NOT_ON_LIST"
         ),
-        "USER_PROGRESS": formatters.shell_safe(
+        "USER_PROGRESS": formatter.shell_safe(
             f"Episode {media_item.user_status.progress}"
             if media_item.user_status
             else "0"
         ),
-        "START_DATE": formatters.shell_safe(
-            formatters.format_date(media_item.start_date)
+        "START_DATE": formatter.shell_safe(
+            formatter.format_date(media_item.start_date)
         ),
-        "END_DATE": formatters.shell_safe(formatters.format_date(media_item.end_date)),
-        "SYNOPSIS": formatters.shell_safe(description),
+        "END_DATE": formatter.shell_safe(formatter.format_date(media_item.end_date)),
+        "SYNOPSIS": formatter.shell_safe(description),
     }
 
     for key, value in replacements.items():
@@ -253,29 +253,29 @@ def _populate_episode_info_template(
     episode_info_script = TEMPLATE_EPISODE_INFO_SCRIPT
 
     replacements = {
-        "TITLE": formatters.shell_safe(title),
-        "NEXT_EPISODE": formatters.shell_safe(
-            f"Episode {media_item.next_airing.episode} on {formatters.format_date(media_item.next_airing.airing_at, '%A, %d %B %Y at %X)')}"
+        "TITLE": formatter.shell_safe(title),
+        "NEXT_EPISODE": formatter.shell_safe(
+            f"Episode {media_item.next_airing.episode} on {formatter.format_date(media_item.next_airing.airing_at, '%A, %d %B %Y at %X)')}"
             if media_item.next_airing
             else "N/A"
         ),
-        "DURATION": formatters.format_media_duration(media_item.duration),
-        "STATUS": formatters.shell_safe(media_item.status.value),
-        "EPISODES": formatters.shell_safe(str(media_item.episodes)),
-        "USER_STATUS": formatters.shell_safe(
+        "DURATION": formatter.format_media_duration(media_item.duration),
+        "STATUS": formatter.shell_safe(media_item.status.value),
+        "EPISODES": formatter.shell_safe(str(media_item.episodes)),
+        "USER_STATUS": formatter.shell_safe(
             media_item.user_status.status.value
             if media_item.user_status and media_item.user_status.status
             else "NOT_ON_LIST"
         ),
-        "USER_PROGRESS": formatters.shell_safe(
+        "USER_PROGRESS": formatter.shell_safe(
             f"Episode {media_item.user_status.progress}"
             if media_item.user_status
             else "0"
         ),
-        "START_DATE": formatters.shell_safe(
-            formatters.format_date(media_item.start_date)
+        "START_DATE": formatter.shell_safe(
+            formatter.format_date(media_item.start_date)
         ),
-        "END_DATE": formatters.shell_safe(formatters.format_date(media_item.end_date)),
+        "END_DATE": formatter.shell_safe(formatter.format_date(media_item.end_date)),
     }
 
     for key, value in replacements.items():
diff --git a/fastanime/core/config/model.py b/fastanime/core/config/model.py
index 9dc3899..ef24c71 100644
--- a/fastanime/core/config/model.py
+++ b/fastanime/core/config/model.py
@@ -5,7 +5,7 @@ from typing import Literal
 from pydantic import BaseModel, Field, PrivateAttr, computed_field
 
 from ...libs.media_api.types import MediaSort, UserMediaListSort
-from ...libs.providers.anime.types import ProviderName, ProviderServer
+from ...libs.provider.anime.types import ProviderName, ProviderServer
 from ..constants import APP_ASCII_ART
 from . import defaults
 from . import descriptions as desc
diff --git a/fastanime/core/utils/converters.py b/fastanime/core/utils/converter.py
similarity index 100%
rename from fastanime/core/utils/converters.py
rename to fastanime/core/utils/converter.py
diff --git a/fastanime/core/utils/formatters.py b/fastanime/core/utils/formatter.py
similarity index 100%
rename from fastanime/core/utils/formatters.py
rename to fastanime/core/utils/formatter.py
diff --git a/fastanime/libs/media_api/anilist/mapper.py b/fastanime/libs/media_api/anilist/mapper.py
index cb43156..a7ab4e2 100644
--- a/fastanime/libs/media_api/anilist/mapper.py
+++ b/fastanime/libs/media_api/anilist/mapper.py
@@ -2,7 +2,7 @@ import logging
 from datetime import datetime
 from typing import Dict, List, Optional
 
-from ....core.utils.formatters import (
+from ....core.utils.formatter import (
     renumber_titles,
     strip_original_episode_prefix,
 )
diff --git a/fastanime/libs/players/__init__.py b/fastanime/libs/player/__init__.py
similarity index 100%
rename from fastanime/libs/players/__init__.py
rename to fastanime/libs/player/__init__.py
diff --git a/fastanime/libs/players/base.py b/fastanime/libs/player/base.py
similarity index 100%
rename from fastanime/libs/players/base.py
rename to fastanime/libs/player/base.py
diff --git a/fastanime/libs/players/mpv/__init__.py b/fastanime/libs/player/mpv/__init__.py
similarity index 100%
rename from fastanime/libs/players/mpv/__init__.py
rename to fastanime/libs/player/mpv/__init__.py
diff --git a/fastanime/libs/players/mpv/player.py b/fastanime/libs/player/mpv/player.py
similarity index 100%
rename from fastanime/libs/players/mpv/player.py
rename to fastanime/libs/player/mpv/player.py
diff --git a/fastanime/libs/players/params.py b/fastanime/libs/player/params.py
similarity index 100%
rename from fastanime/libs/players/params.py
rename to fastanime/libs/player/params.py
diff --git a/fastanime/libs/players/player.py b/fastanime/libs/player/player.py
similarity index 100%
rename from fastanime/libs/players/player.py
rename to fastanime/libs/player/player.py
diff --git a/fastanime/libs/players/syncplay/__init__.py b/fastanime/libs/player/syncplay/__init__.py
similarity index 100%
rename from fastanime/libs/players/syncplay/__init__.py
rename to fastanime/libs/player/syncplay/__init__.py
diff --git a/fastanime/libs/players/syncplay/player.py b/fastanime/libs/player/syncplay/player.py
similarity index 100%
rename from fastanime/libs/players/syncplay/player.py
rename to fastanime/libs/player/syncplay/player.py
diff --git a/fastanime/libs/players/types.py b/fastanime/libs/player/types.py
similarity index 100%
rename from fastanime/libs/players/types.py
rename to fastanime/libs/player/types.py
diff --git a/fastanime/libs/players/vlc/__init__.py b/fastanime/libs/player/vlc/__init__.py
similarity index 100%
rename from fastanime/libs/players/vlc/__init__.py
rename to fastanime/libs/player/vlc/__init__.py
diff --git a/fastanime/libs/players/vlc/player.py b/fastanime/libs/player/vlc/player.py
similarity index 100%
rename from fastanime/libs/players/vlc/player.py
rename to fastanime/libs/player/vlc/player.py
diff --git a/fastanime/libs/providers/__init__.py b/fastanime/libs/provider/__init__.py
similarity index 100%
rename from fastanime/libs/providers/__init__.py
rename to fastanime/libs/provider/__init__.py
diff --git a/fastanime/libs/providers/anime/__init__.py b/fastanime/libs/provider/anime/__init__.py
similarity index 100%
rename from fastanime/libs/providers/anime/__init__.py
rename to fastanime/libs/provider/anime/__init__.py
diff --git a/fastanime/libs/providers/anime/allanime/__init__.py b/fastanime/libs/provider/anime/allanime/__init__.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/__init__.py
rename to fastanime/libs/provider/anime/allanime/__init__.py
diff --git a/fastanime/libs/providers/anime/allanime/constants.py b/fastanime/libs/provider/anime/allanime/constants.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/constants.py
rename to fastanime/libs/provider/anime/allanime/constants.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/__init__.py b/fastanime/libs/provider/anime/allanime/extractors/__init__.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/__init__.py
rename to fastanime/libs/provider/anime/allanime/extractors/__init__.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/ak.py b/fastanime/libs/provider/anime/allanime/extractors/ak.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/ak.py
rename to fastanime/libs/provider/anime/allanime/extractors/ak.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/base.py b/fastanime/libs/provider/anime/allanime/extractors/base.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/base.py
rename to fastanime/libs/provider/anime/allanime/extractors/base.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/dropbox.py b/fastanime/libs/provider/anime/allanime/extractors/dropbox.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/dropbox.py
rename to fastanime/libs/provider/anime/allanime/extractors/dropbox.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/extractor.py b/fastanime/libs/provider/anime/allanime/extractors/extractor.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/extractor.py
rename to fastanime/libs/provider/anime/allanime/extractors/extractor.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/filemoon.py b/fastanime/libs/provider/anime/allanime/extractors/filemoon.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/filemoon.py
rename to fastanime/libs/provider/anime/allanime/extractors/filemoon.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/gogoanime.py b/fastanime/libs/provider/anime/allanime/extractors/gogoanime.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/gogoanime.py
rename to fastanime/libs/provider/anime/allanime/extractors/gogoanime.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/mp4_upload.py b/fastanime/libs/provider/anime/allanime/extractors/mp4_upload.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/mp4_upload.py
rename to fastanime/libs/provider/anime/allanime/extractors/mp4_upload.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/sharepoint.py b/fastanime/libs/provider/anime/allanime/extractors/sharepoint.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/sharepoint.py
rename to fastanime/libs/provider/anime/allanime/extractors/sharepoint.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/streamsb.py b/fastanime/libs/provider/anime/allanime/extractors/streamsb.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/streamsb.py
rename to fastanime/libs/provider/anime/allanime/extractors/streamsb.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/vid_mp4.py b/fastanime/libs/provider/anime/allanime/extractors/vid_mp4.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/vid_mp4.py
rename to fastanime/libs/provider/anime/allanime/extractors/vid_mp4.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/we_transfer.py b/fastanime/libs/provider/anime/allanime/extractors/we_transfer.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/we_transfer.py
rename to fastanime/libs/provider/anime/allanime/extractors/we_transfer.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/wixmp.py b/fastanime/libs/provider/anime/allanime/extractors/wixmp.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/wixmp.py
rename to fastanime/libs/provider/anime/allanime/extractors/wixmp.py
diff --git a/fastanime/libs/providers/anime/allanime/extractors/yt_mp4.py b/fastanime/libs/provider/anime/allanime/extractors/yt_mp4.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/extractors/yt_mp4.py
rename to fastanime/libs/provider/anime/allanime/extractors/yt_mp4.py
diff --git a/fastanime/libs/providers/anime/allanime/mappers.py b/fastanime/libs/provider/anime/allanime/mappers.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/mappers.py
rename to fastanime/libs/provider/anime/allanime/mappers.py
diff --git a/fastanime/libs/providers/anime/allanime/provider.py b/fastanime/libs/provider/anime/allanime/provider.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/provider.py
rename to fastanime/libs/provider/anime/allanime/provider.py
diff --git a/fastanime/libs/providers/anime/allanime/types.py b/fastanime/libs/provider/anime/allanime/types.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/types.py
rename to fastanime/libs/provider/anime/allanime/types.py
diff --git a/fastanime/libs/providers/anime/allanime/utils.py b/fastanime/libs/provider/anime/allanime/utils.py
similarity index 100%
rename from fastanime/libs/providers/anime/allanime/utils.py
rename to fastanime/libs/provider/anime/allanime/utils.py
diff --git a/fastanime/libs/providers/anime/animepahe/__init__.py b/fastanime/libs/provider/anime/animepahe/__init__.py
similarity index 100%
rename from fastanime/libs/providers/anime/animepahe/__init__.py
rename to fastanime/libs/provider/anime/animepahe/__init__.py
diff --git a/fastanime/libs/providers/anime/animepahe/constants.py b/fastanime/libs/provider/anime/animepahe/constants.py
similarity index 100%
rename from fastanime/libs/providers/anime/animepahe/constants.py
rename to fastanime/libs/provider/anime/animepahe/constants.py
diff --git a/fastanime/libs/providers/anime/animepahe/extractor.py b/fastanime/libs/provider/anime/animepahe/extractor.py
similarity index 100%
rename from fastanime/libs/providers/anime/animepahe/extractor.py
rename to fastanime/libs/provider/anime/animepahe/extractor.py
diff --git a/fastanime/libs/providers/anime/animepahe/mappers.py b/fastanime/libs/provider/anime/animepahe/mappers.py
similarity index 100%
rename from fastanime/libs/providers/anime/animepahe/mappers.py
rename to fastanime/libs/provider/anime/animepahe/mappers.py
diff --git a/fastanime/libs/providers/anime/animepahe/provider.py b/fastanime/libs/provider/anime/animepahe/provider.py
similarity index 100%
rename from fastanime/libs/providers/anime/animepahe/provider.py
rename to fastanime/libs/provider/anime/animepahe/provider.py
diff --git a/fastanime/libs/providers/anime/animepahe/types.py b/fastanime/libs/provider/anime/animepahe/types.py
similarity index 100%
rename from fastanime/libs/providers/anime/animepahe/types.py
rename to fastanime/libs/provider/anime/animepahe/types.py
diff --git a/fastanime/libs/providers/anime/base.py b/fastanime/libs/provider/anime/base.py
similarity index 100%
rename from fastanime/libs/providers/anime/base.py
rename to fastanime/libs/provider/anime/base.py
diff --git a/fastanime/libs/providers/anime/params.py b/fastanime/libs/provider/anime/params.py
similarity index 100%
rename from fastanime/libs/providers/anime/params.py
rename to fastanime/libs/provider/anime/params.py
diff --git a/fastanime/libs/providers/anime/provider.py b/fastanime/libs/provider/anime/provider.py
similarity index 100%
rename from fastanime/libs/providers/anime/provider.py
rename to fastanime/libs/provider/anime/provider.py
diff --git a/fastanime/libs/providers/anime/types.py b/fastanime/libs/provider/anime/types.py
similarity index 100%
rename from fastanime/libs/providers/anime/types.py
rename to fastanime/libs/provider/anime/types.py
diff --git a/fastanime/libs/providers/anime/utils/debug.py b/fastanime/libs/provider/anime/utils/debug.py
similarity index 100%
rename from fastanime/libs/providers/anime/utils/debug.py
rename to fastanime/libs/provider/anime/utils/debug.py
diff --git a/fastanime/libs/providers/manga/MangaProvider.py b/fastanime/libs/provider/manga/MangaProvider.py
similarity index 100%
rename from fastanime/libs/providers/manga/MangaProvider.py
rename to fastanime/libs/provider/manga/MangaProvider.py
diff --git a/fastanime/libs/providers/manga/__init__.py b/fastanime/libs/provider/manga/__init__.py
similarity index 100%
rename from fastanime/libs/providers/manga/__init__.py
rename to fastanime/libs/provider/manga/__init__.py
diff --git a/fastanime/libs/providers/manga/base.py b/fastanime/libs/provider/manga/base.py
similarity index 100%
rename from fastanime/libs/providers/manga/base.py
rename to fastanime/libs/provider/manga/base.py
diff --git a/fastanime/libs/providers/manga/common.py b/fastanime/libs/provider/manga/common.py
similarity index 100%
rename from fastanime/libs/providers/manga/common.py
rename to fastanime/libs/provider/manga/common.py
diff --git a/fastanime/libs/providers/manga/mangadex/__init__.py b/fastanime/libs/provider/manga/mangadex/__init__.py
similarity index 100%
rename from fastanime/libs/providers/manga/mangadex/__init__.py
rename to fastanime/libs/provider/manga/mangadex/__init__.py
diff --git a/fastanime/libs/providers/manga/mangadex/api.py b/fastanime/libs/provider/manga/mangadex/api.py
similarity index 100%
rename from fastanime/libs/providers/manga/mangadex/api.py
rename to fastanime/libs/provider/manga/mangadex/api.py