diff --git a/lib/phoenix_kit/config/config.ex b/lib/phoenix_kit/config/config.ex
index cd189a912..de1a2eb95 100644
--- a/lib/phoenix_kit/config/config.ex
+++ b/lib/phoenix_kit/config/config.ex
@@ -28,6 +28,7 @@ defmodule PhoenixKit.Config do
   - `:layout_module` - Custom layout configuration
   - `:from_email` - Default sender email address for notifications
   - `:from_name` - Default sender name for notifications (default: "PhoenixKit")
+  - `:users_module` - User schema module (default: PhoenixKit.Users.Auth.User)
 
   ## Type-Safe Functions
 
@@ -61,6 +62,7 @@ defmodule PhoenixKit.Config do
     secret_key_base: nil,
     oauth_base_url: nil,
     # Module-specific settings
+    users_module: PhoenixKit.Users.Auth.User,
     blogging_settings_module: PhoenixKit.Settings
   ]
 
@@ -335,6 +337,17 @@ defmodule PhoenixKit.Config do
     end
   end
 
+  @doc """
+  Gets the configured users module.
+  """
+  @spec get_users_module() :: module()
+  def get_users_module do
+    case get(:users_module) do
+      {:ok, users_module} when is_atom(users_module) -> users_module
+      _ -> PhoenixKit.Users.Auth.User
+    end
+  end
+
   @doc """
   Gets the configured repository module.
   """
@@ -375,6 +388,20 @@ defmodule PhoenixKit.Config do
     end
   end
 
+  @doc """
+  Gets configuration from the parent application.
+
+  This is useful for accessing parent app mailer, endpoint, or other configurations
+  that PhoenixKit needs to integrate with.
+  """
+  @spec get_parent_app_config(atom(), any()) :: any()
+  def get_parent_app_config(key, default \\ nil) do
+    case get_parent_app() do
+      nil -> default
+      app -> Application.get_env(app, key, default)
+    end
+  end
+
   @doc """
   Gets the parent application name that is using PhoenixKit.
 
diff --git a/lib/phoenix_kit/mailer.ex b/lib/phoenix_kit/mailer.ex
index da66c1c9f..6b57672d2 100644
--- a/lib/phoenix_kit/mailer.ex
+++ b/lib/phoenix_kit/mailer.ex
@@ -196,7 +196,14 @@ defmodule PhoenixKit.Mailer do
 
   # Deliver email with runtime configuration for AWS SES
   defp deliver_with_runtime_config(email, mailer, app \\ :phoenix_kit) do
-    config = Application.get_env(app, mailer, [])
+    config =
+      if app == :phoenix_kit do
+        # Use PhoenixKit config for built-in mailer
+        PhoenixKit.Config.get(mailer, [])
+      else
+        # Use parent app config for parent mailer
+        PhoenixKit.Config.get_parent_app_config(mailer, [])
+      end
 
     # If using AWS SES, override with runtime settings from DB
     runtime_config =
@@ -413,8 +420,7 @@ defmodule PhoenixKit.Mailer do
 
   # Detect provider for parent application mailer
   defp detect_parent_app_provider(mailer) when is_atom(mailer) do
-    app = PhoenixKit.Config.get_parent_app()
-    config = Application.get_env(app, mailer, [])
+    config = PhoenixKit.Config.get_parent_app_config(mailer, [])
     adapter = Keyword.get(config, :adapter)
     Utils.adapter_to_provider_name(adapter, "parent_app_mailer")
   end
diff --git a/lib/phoenix_kit/module/languages.ex b/lib/phoenix_kit/modules/languages.ex
similarity index 89%
rename from lib/phoenix_kit/module/languages.ex
rename to lib/phoenix_kit/modules/languages.ex
index b1e51b7da..9c702ce6d 100644
--- a/lib/phoenix_kit/module/languages.ex
+++ b/lib/phoenix_kit/modules/languages.ex
@@ -1,4 +1,4 @@
-defmodule PhoenixKit.Module.Languages do
+defmodule PhoenixKit.Modules.Languages do
   @moduledoc """
   Languages management for PhoenixKit - complete language configuration in a single module.
 
@@ -40,34 +40,34 @@ defmodule PhoenixKit.Module.Languages do
   ## Usage Examples
 
       # Check if languages are enabled
-      if PhoenixKit.Module.Languages.enabled?() do
+      if PhoenixKit.Modules.Languages.enabled?() do
         # Languages are active
       end
 
       # Enable languages (creates default English language)
-      {:ok, config} = PhoenixKit.Module.Languages.enable_system()
+      {:ok, config} = PhoenixKit.Modules.Languages.enable_system()
 
       # Add a new language
-      {:ok, config} = PhoenixKit.Module.Languages.add_language("es")
+      {:ok, config} = PhoenixKit.Modules.Languages.add_language("es")
 
       # Get all languages
-      languages = PhoenixKit.Module.Languages.get_languages()
+      languages = PhoenixKit.Modules.Languages.get_languages()
       # => [%{code: "en", name: "English", is_default: true, is_enabled: true}, ...]
 
       # Get only enabled languages (most common use case)
-      enabled_languages = PhoenixKit.Module.Languages.get_enabled_languages()
+      enabled_languages = PhoenixKit.Modules.Languages.get_enabled_languages()
       # => [%{code: "en", name: "English", ...}, %{code: "es", name: "Spanish", ...}]
 
       # Get a specific language by code
-      spanish = PhoenixKit.Module.Languages.get_language("es")
+      spanish = PhoenixKit.Modules.Languages.get_language("es")
       # => %{code: "es", name: "Spanish", is_enabled: true}
 
       # Get just the language codes
-      codes = PhoenixKit.Module.Languages.get_enabled_language_codes()
+      codes = PhoenixKit.Modules.Languages.get_enabled_language_codes()
       # => ["en", "es", "fr"]
 
       # Check if a language is valid and enabled
-      if PhoenixKit.Module.Languages.language_enabled?("es") do
+      if PhoenixKit.Modules.Languages.language_enabled?("es") do
         # Use Spanish language
       end
 
@@ -221,7 +221,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.enabled?()
+      iex> PhoenixKit.Modules.Languages.enabled?()
       false
   """
   def enabled? do
@@ -239,7 +239,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.enable_system()
+      iex> PhoenixKit.Modules.Languages.enable_system()
       {:ok, %{"languages" => [%{"code" => "en", ...}]}}
   """
   def enable_system do
@@ -270,7 +270,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.disable_system()
+      iex> PhoenixKit.Modules.Languages.disable_system()
       {:ok, %Setting{}}
   """
   def disable_system do
@@ -284,7 +284,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_config()
+      iex> PhoenixKit.Modules.Languages.get_config()
       %{
         enabled: true,
         languages: [%{"code" => "en", "name" => "English", ...}],
@@ -317,11 +317,11 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_languages()
+      iex> PhoenixKit.Modules.Languages.get_languages()
       [%{"code" => "en", "name" => "English", "is_default" => true, ...}]
 
       # When system is disabled:
-      iex> PhoenixKit.Module.Languages.get_languages()
+      iex> PhoenixKit.Modules.Languages.get_languages()
       []
   """
   def get_languages do
@@ -342,7 +342,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_enabled_languages()
+      iex> PhoenixKit.Modules.Languages.get_enabled_languages()
       [%{"code" => "en", "name" => "English", ...}]
   """
   def get_enabled_languages do
@@ -358,11 +358,11 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_default_language()
+      iex> PhoenixKit.Modules.Languages.get_default_language()
       %{"code" => "en", "name" => "English", "is_default" => true, ...}
 
       # When system is disabled:
-      iex> PhoenixKit.Module.Languages.get_default_language()
+      iex> PhoenixKit.Modules.Languages.get_default_language()
       nil
   """
   def get_default_language do
@@ -381,10 +381,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_language("es")
+      iex> PhoenixKit.Modules.Languages.get_language("es")
       %{"code" => "es", "name" => "Spanish", "is_enabled" => true}
 
-      iex> PhoenixKit.Module.Languages.get_language("invalid")
+      iex> PhoenixKit.Modules.Languages.get_language("invalid")
       nil
   """
   def get_language(code) when is_binary(code) do
@@ -403,7 +403,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_language_codes()
+      iex> PhoenixKit.Modules.Languages.get_language_codes()
       ["en", "es", "fr"]
   """
   def get_language_codes do
@@ -418,7 +418,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_enabled_language_codes()
+      iex> PhoenixKit.Modules.Languages.get_enabled_language_codes()
       ["en", "es"]
   """
   def get_enabled_language_codes do
@@ -434,11 +434,11 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.enabled_locale_codes()
+      iex> PhoenixKit.Modules.Languages.enabled_locale_codes()
       ["en", "es", "fr"]
 
       # When system is disabled:
-      iex> PhoenixKit.Module.Languages.enabled_locale_codes()
+      iex> PhoenixKit.Modules.Languages.enabled_locale_codes()
       ["en"]
   """
   def enabled_locale_codes do
@@ -465,11 +465,11 @@ defmodule PhoenixKit.Module.Languages do
   ## Examples
 
       # When enabled (any number of languages)
-      iex> PhoenixKit.Module.Languages.get_display_languages()
+      iex> PhoenixKit.Modules.Languages.get_display_languages()
       [%{"code" => "en", "name" => "English", ...}]
 
       # When disabled
-      iex> PhoenixKit.Module.Languages.get_display_languages()
+      iex> PhoenixKit.Modules.Languages.get_display_languages()
       [%{"code" => "en", ...}, %{"code" => "es", ...}, ...]  # Top 12 default
   """
   def get_display_languages do
@@ -490,10 +490,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.in_configured_mode?()
+      iex> PhoenixKit.Modules.Languages.in_configured_mode?()
       true  # When enabled with 2+ languages
 
-      iex> PhoenixKit.Module.Languages.in_configured_mode?()
+      iex> PhoenixKit.Modules.Languages.in_configured_mode?()
       false  # When disabled or only 1 language
   """
   def in_configured_mode? do
@@ -507,10 +507,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.valid_language?("es")
+      iex> PhoenixKit.Modules.Languages.valid_language?("es")
       true
 
-      iex> PhoenixKit.Module.Languages.valid_language?("invalid")
+      iex> PhoenixKit.Modules.Languages.valid_language?("invalid")
       false
   """
   def valid_language?(code) when is_binary(code) do
@@ -524,10 +524,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.language_enabled?("es")
+      iex> PhoenixKit.Modules.Languages.language_enabled?("es")
       true
 
-      iex> PhoenixKit.Module.Languages.language_enabled?("disabled_lang")
+      iex> PhoenixKit.Modules.Languages.language_enabled?("disabled_lang")
       false
   """
   def language_enabled?(code) when is_binary(code) do
@@ -546,7 +546,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_default_language_codes()
+      iex> PhoenixKit.Modules.Languages.get_default_language_codes()
       ["en", "es", "fr", "de", "pt", "it", "nl", "ru", "ja", "ko", "zh-CN", "ar"]
   """
   def get_default_language_codes do
@@ -562,7 +562,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_available_languages()
+      iex> PhoenixKit.Modules.Languages.get_available_languages()
       [%{code: "en", name: "English", native: "English", flag: "🇺🇸"}, ...]
   """
   def get_available_languages do
@@ -577,7 +577,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_available_languages_for_selection()
+      iex> PhoenixKit.Modules.Languages.get_available_languages_for_selection()
       [%{code: "es", name: "Spanish", native: "Español", flag: "🇪🇸"}, ...]
   """
   def get_available_languages_for_selection do
@@ -598,10 +598,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.get_predefined_language("es")
+      iex> PhoenixKit.Modules.Languages.get_predefined_language("es")
       %{code: "es", name: "Spanish", native: "Español", flag: "🇪🇸"}
 
-      iex> PhoenixKit.Module.Languages.get_predefined_language("invalid")
+      iex> PhoenixKit.Modules.Languages.get_predefined_language("invalid")
       nil
   """
   def get_predefined_language(code) when is_binary(code) do
@@ -617,13 +617,13 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.add_language("es")
+      iex> PhoenixKit.Modules.Languages.add_language("es")
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.add_language("en")  # if already exists
+      iex> PhoenixKit.Modules.Languages.add_language("en")  # if already exists
       {:error, "Language already exists"}
 
-      iex> PhoenixKit.Module.Languages.add_language("invalid")
+      iex> PhoenixKit.Modules.Languages.add_language("invalid")
       {:error, "Language not found in available languages"}
   """
   def add_language(code) when is_binary(code) do
@@ -668,10 +668,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.update_language("es", %{name: "Español"})
+      iex> PhoenixKit.Modules.Languages.update_language("es", %{name: "Español"})
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.update_language("nonexistent", %{name: "Test"})
+      iex> PhoenixKit.Modules.Languages.update_language("nonexistent", %{name: "Test"})
       {:error, "Language not found"}
   """
   def update_language(code, attrs) when is_binary(code) and is_map(attrs) do
@@ -694,10 +694,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.remove_language("es")
+      iex> PhoenixKit.Modules.Languages.remove_language("es")
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.remove_language("en")  # if it's default
+      iex> PhoenixKit.Modules.Languages.remove_language("en")  # if it's default
       {:error, "Cannot remove default language"}
   """
   def remove_language(code) when is_binary(code) do
@@ -735,10 +735,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.set_default_language("es")
+      iex> PhoenixKit.Modules.Languages.set_default_language("es")
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.set_default_language("nonexistent")
+      iex> PhoenixKit.Modules.Languages.set_default_language("nonexistent")
       {:error, "Language not found"}
   """
   def set_default_language(code) when is_binary(code) do
@@ -750,7 +750,7 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.enable_language("es")
+      iex> PhoenixKit.Modules.Languages.enable_language("es")
       {:ok, updated_config}
   """
   def enable_language(code) when is_binary(code) do
@@ -764,10 +764,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.disable_language("es")
+      iex> PhoenixKit.Modules.Languages.disable_language("es")
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.disable_language("en")  # if it's default
+      iex> PhoenixKit.Modules.Languages.disable_language("en")  # if it's default
       {:error, "Cannot disable default language"}
   """
   def disable_language(code) when is_binary(code) do
@@ -788,10 +788,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.move_language_up("es")
+      iex> PhoenixKit.Modules.Languages.move_language_up("es")
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.move_language_up("en")  # if first in array
+      iex> PhoenixKit.Modules.Languages.move_language_up("en")  # if first in array
       {:error, "Language is already at the top"}
   """
   def move_language_up(code) when is_binary(code) do
@@ -835,10 +835,10 @@ defmodule PhoenixKit.Module.Languages do
 
   ## Examples
 
-      iex> PhoenixKit.Module.Languages.move_language_down("en")
+      iex> PhoenixKit.Modules.Languages.move_language_down("en")
       {:ok, updated_config}
 
-      iex> PhoenixKit.Module.Languages.move_language_down("es")  # if last in array
+      iex> PhoenixKit.Modules.Languages.move_language_down("es")  # if last in array
       {:error, "Language is already at the bottom"}
   """
   def move_language_down(code) when is_binary(code) do
diff --git a/lib/phoenix_kit/settings/settings.ex b/lib/phoenix_kit/settings/settings.ex
index dc6584801..8f81fb614 100644
--- a/lib/phoenix_kit/settings/settings.ex
+++ b/lib/phoenix_kit/settings/settings.ex
@@ -66,7 +66,7 @@ defmodule PhoenixKit.Settings do
   import Ecto.Query, warn: false
   import Ecto.Changeset, only: [add_error: 3]
 
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings.Events, as: SettingsEvents
   alias PhoenixKit.Settings.Setting
   alias PhoenixKit.Settings.Setting.SettingsForm
diff --git a/lib/phoenix_kit_web/components/admin_nav.ex b/lib/phoenix_kit_web/components/admin_nav.ex
index 40b0b5955..da24e0807 100644
--- a/lib/phoenix_kit_web/components/admin_nav.ex
+++ b/lib/phoenix_kit_web/components/admin_nav.ex
@@ -7,7 +7,7 @@ defmodule PhoenixKitWeb.Components.AdminNav do
   use Phoenix.Component
 
   alias Phoenix.LiveView.JS
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings
   alias PhoenixKit.ThemeConfig
   alias PhoenixKit.Users.Auth.Scope
diff --git a/lib/phoenix_kit_web/components/core/language_switcher.ex b/lib/phoenix_kit_web/components/core/language_switcher.ex
index 1d5491dad..16de76725 100644
--- a/lib/phoenix_kit_web/components/core/language_switcher.ex
+++ b/lib/phoenix_kit_web/components/core/language_switcher.ex
@@ -28,7 +28,7 @@ defmodule PhoenixKitWeb.Components.Core.LanguageSwitcher do
   use Phoenix.Component
 
   alias Phoenix.LiveView.JS
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKitWeb.Components.Core.Icon
 
   @doc """
diff --git a/lib/phoenix_kit_web/components/layout_wrapper.ex b/lib/phoenix_kit_web/components/layout_wrapper.ex
index 52779b087..d061e75b2 100644
--- a/lib/phoenix_kit_web/components/layout_wrapper.ex
+++ b/lib/phoenix_kit_web/components/layout_wrapper.ex
@@ -34,7 +34,7 @@ defmodule PhoenixKitWeb.Components.LayoutWrapper do
 
   alias Phoenix.HTML
   alias PhoenixKit.Config
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Modules.SEO
   alias PhoenixKit.ThemeConfig
   alias PhoenixKit.Users.Auth.Scope
diff --git a/lib/phoenix_kit_web/controllers/blog_controller.ex b/lib/phoenix_kit_web/controllers/blog_controller.ex
index 3255348d0..86a18af74 100644
--- a/lib/phoenix_kit_web/controllers/blog_controller.ex
+++ b/lib/phoenix_kit_web/controllers/blog_controller.ex
@@ -14,7 +14,7 @@ defmodule PhoenixKitWeb.BlogController do
   require Logger
 
   alias PhoenixKit.Blogging.Renderer
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings
   alias PhoenixKitWeb.BlogHTML
   alias PhoenixKitWeb.Live.Modules.Blogging
diff --git a/lib/phoenix_kit_web/controllers/blog_html.ex b/lib/phoenix_kit_web/controllers/blog_html.ex
index a2738f557..b1bf3b7cc 100644
--- a/lib/phoenix_kit_web/controllers/blog_html.ex
+++ b/lib/phoenix_kit_web/controllers/blog_html.ex
@@ -6,7 +6,7 @@ defmodule PhoenixKitWeb.BlogHTML do
 
   alias PhoenixKit.Blogging.Renderer
   alias PhoenixKit.Config
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Storage
 
   embed_templates("blog_html/*")
diff --git a/lib/phoenix_kit_web/integration.ex b/lib/phoenix_kit_web/integration.ex
index 8d294f5b8..8e3cd39d9 100644
--- a/lib/phoenix_kit_web/integration.ex
+++ b/lib/phoenix_kit_web/integration.ex
@@ -115,7 +115,7 @@ defmodule PhoenixKitWeb.Integration do
       end
 
     quote do
-      alias PhoenixKit.Module.Languages
+      alias PhoenixKit.Modules.Languages
 
       # Define locale validation pipeline
       pipeline :phoenix_kit_locale_validation do
@@ -145,7 +145,7 @@ defmodule PhoenixKitWeb.Integration do
   # Helper function to generate pipeline definitions
   defp generate_pipelines do
     quote do
-      alias PhoenixKit.Module.Languages
+      alias PhoenixKit.Modules.Languages
 
       # Define the auto-setup pipeline
       pipeline :phoenix_kit_auto_setup do
diff --git a/lib/phoenix_kit_web/live/components/media_selector_modal.ex b/lib/phoenix_kit_web/live/components/media_selector_modal.ex
index a26d9b42c..64e51d123 100644
--- a/lib/phoenix_kit_web/live/components/media_selector_modal.ex
+++ b/lib/phoenix_kit_web/live/components/media_selector_modal.ex
@@ -306,7 +306,7 @@ defmodule PhoenixKitWeb.Live.Components.MediaSelectorModal do
   end
 
   defp load_files(socket, page) do
-    repo = Application.get_env(:phoenix_kit, :repo)
+    repo = PhoenixKit.Config.get_repo()
     per_page = socket.assigns.per_page
     filter = socket.assigns.file_type_filter
     search = socket.assigns.search_query
diff --git a/lib/phoenix_kit_web/live/modules.ex b/lib/phoenix_kit_web/live/modules.ex
index 848af295c..c2e1e9a7f 100644
--- a/lib/phoenix_kit_web/live/modules.ex
+++ b/lib/phoenix_kit_web/live/modules.ex
@@ -8,7 +8,7 @@ defmodule PhoenixKitWeb.Live.Modules do
   use Gettext, backend: PhoenixKitWeb.Gettext
 
   alias PhoenixKit.Entities
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Modules.Maintenance
   alias PhoenixKit.Modules.SEO
   alias PhoenixKit.Modules.Storage
diff --git a/lib/phoenix_kit_web/live/modules/blogging/blogging.ex b/lib/phoenix_kit_web/live/modules/blogging/blogging.ex
index 0ab4253ce..5f072f8b8 100644
--- a/lib/phoenix_kit_web/live/modules/blogging/blogging.ex
+++ b/lib/phoenix_kit_web/live/modules/blogging/blogging.ex
@@ -6,7 +6,7 @@ defmodule PhoenixKitWeb.Live.Modules.Blogging do
   for creating timestamped markdown blog posts.
   """
 
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Users.Auth.Scope
   alias PhoenixKitWeb.Live.Modules.Blogging.Storage
 
diff --git a/lib/phoenix_kit_web/live/modules/blogging/context/storage.ex b/lib/phoenix_kit_web/live/modules/blogging/context/storage.ex
index d854c22f4..d72f746ae 100644
--- a/lib/phoenix_kit_web/live/modules/blogging/context/storage.ex
+++ b/lib/phoenix_kit_web/live/modules/blogging/context/storage.ex
@@ -11,7 +11,7 @@ defmodule PhoenixKitWeb.Live.Modules.Blogging.Storage do
   component markup for building pages with swappable design variants.
   """
 
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings
   alias PhoenixKitWeb.Live.Modules.Blogging.Metadata
 
diff --git a/lib/phoenix_kit_web/live/modules/blogging/settings.ex b/lib/phoenix_kit_web/live/modules/blogging/settings.ex
index 459bb06b4..f9695ddb3 100644
--- a/lib/phoenix_kit_web/live/modules/blogging/settings.ex
+++ b/lib/phoenix_kit_web/live/modules/blogging/settings.ex
@@ -5,7 +5,7 @@ defmodule PhoenixKitWeb.Live.Modules.Blogging.Settings do
   use PhoenixKitWeb, :live_view
   use Gettext, backend: PhoenixKitWeb.Gettext
 
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings
   alias PhoenixKit.Utils.Routes
   alias PhoenixKitWeb.Live.Modules.Blogging
diff --git a/lib/phoenix_kit_web/live/modules/languages.ex b/lib/phoenix_kit_web/live/modules/languages.ex
index 1532d5f0f..c85e54e74 100644
--- a/lib/phoenix_kit_web/live/modules/languages.ex
+++ b/lib/phoenix_kit_web/live/modules/languages.ex
@@ -6,7 +6,7 @@ defmodule PhoenixKitWeb.Live.Modules.Languages do
   """
   use PhoenixKitWeb, :live_view
 
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings
   alias PhoenixKit.Utils.Routes
 
diff --git a/lib/phoenix_kit_web/live/settings.ex b/lib/phoenix_kit_web/live/settings.ex
index a788a9a09..8553fb6f2 100644
--- a/lib/phoenix_kit_web/live/settings.ex
+++ b/lib/phoenix_kit_web/live/settings.ex
@@ -7,7 +7,7 @@ defmodule PhoenixKitWeb.Live.Settings do
   use PhoenixKitWeb, :live_view
   use Gettext, backend: PhoenixKitWeb.Gettext
 
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Settings
   alias PhoenixKit.Settings.Events, as: SettingsEvents
   alias PhoenixKit.Users.OAuthConfig
diff --git a/lib/phoenix_kit_web/live/settings.html.heex b/lib/phoenix_kit_web/live/settings.html.heex
index a96f055a5..1779f6f11 100644
--- a/lib/phoenix_kit_web/live/settings.html.heex
+++ b/lib/phoenix_kit_web/live/settings.html.heex
@@ -1210,7 +1210,7 @@
                           end %>
                         <%= for language_code <- shown_languages do %>
                           <% language =
-                            PhoenixKit.Module.Languages.get_predefined_language(language_code) %>
+                            PhoenixKit.Modules.Languages.get_predefined_language(language_code) %>
                           <% language_flag = if language, do: language.flag, else: "🌐" %>
                           <div class="badge badge-primary gap-1 px-2">
                             <span class="text-lg">{language_flag}</span>
@@ -1245,7 +1245,7 @@
                   >
                     <ul class="space-y-1">
                       <%!-- Popular Languages Section --%>
-                      <%= for language <- Enum.filter(PhoenixKit.Module.Languages.get_available_languages(), & &1.code in PhoenixKit.Module.Languages.get_default_language_codes()) do %>
+                      <%= for language <- Enum.filter(PhoenixKit.Modules.Languages.get_available_languages(), & &1.code in PhoenixKit.Modules.Languages.get_default_language_codes()) do %>
                         <% is_selected = language.code in @admin_languages %>
                         <li>
                           <a
diff --git a/lib/phoenix_kit_web/live/users/media_detail.ex b/lib/phoenix_kit_web/live/users/media_detail.ex
index 9c453b3c6..7f1fa497a 100644
--- a/lib/phoenix_kit_web/live/users/media_detail.ex
+++ b/lib/phoenix_kit_web/live/users/media_detail.ex
@@ -147,7 +147,7 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do
   defp get_user_name(nil, _repo), do: "Unknown"
 
   defp get_user_name(user_id, repo) do
-    alias_module = Application.get_env(:phoenix_kit, :users_module, PhoenixKit.Users.Auth.User)
+    alias_module = PhoenixKit.Config.get_users_module()
 
     case repo.get(alias_module, user_id) do
       nil -> "Unknown"
diff --git a/lib/phoenix_kit_web/live/users/media_selector.ex b/lib/phoenix_kit_web/live/users/media_selector.ex
index ce7130a28..5f26e4e53 100644
--- a/lib/phoenix_kit_web/live/users/media_selector.ex
+++ b/lib/phoenix_kit_web/live/users/media_selector.ex
@@ -240,7 +240,7 @@ defmodule PhoenixKitWeb.Live.Users.MediaSelector do
   end
 
   defp load_files(socket, page) do
-    repo = Application.get_env(:phoenix_kit, :repo)
+    repo = PhoenixKit.Config.get_repo()
     per_page = socket.assigns.per_page
     filter = socket.assigns.file_type_filter
     search = socket.assigns.search_query
diff --git a/lib/phoenix_kit_web/users/auth.ex b/lib/phoenix_kit_web/users/auth.ex
index d5e3eced5..4dd575dd0 100644
--- a/lib/phoenix_kit_web/users/auth.ex
+++ b/lib/phoenix_kit_web/users/auth.ex
@@ -28,7 +28,7 @@ defmodule PhoenixKitWeb.Users.Auth do
 
   alias Phoenix.LiveView
   alias PhoenixKit.Admin.Events
-  alias PhoenixKit.Module.Languages
+  alias PhoenixKit.Modules.Languages
   alias PhoenixKit.Modules.Maintenance
   alias PhoenixKit.Users.Auth
   alias PhoenixKit.Users.Auth.{Scope, User}
diff --git a/usage-rules.md b/usage-rules.md
index 7f6dcab55..39aae12d4 100644
--- a/usage-rules.md
+++ b/usage-rules.md
@@ -78,7 +78,7 @@ PhoenixKit is a comprehensive SaaS starter kit for Phoenix applications that pro
 - Database-stored language configuration using JSON settings
 - Admin interface for language management at `/phoenix_kit/admin/modules/languages`
 - Functions: `enabled?/0`, `get_languages/0`, `get_enabled_languages/0`, `get_default_language/0`
-- Module: `PhoenixKit.Module.Languages`
+- Module: `PhoenixKit.Modules.Languages`
 
 ### Emails
 - Email tracking with delivery status and events