diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index d67347f..e2158ad 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -9,4 +9,16 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "ht_*"
+      - dependency-name: "auth_api"
+      - dependency-name: "auth_client"
+      - dependency-name: "auth_inmemory"
+      - dependency-name: "auth_repository"
+      - dependency-name: "data_api"
+      - dependency-name: "data_client"
+      - dependency-name: "data_inmemory"
+      - dependency-name: "data_repository"
+      - dependency-name: "http_client"
+      - dependency-name: "kv_storage_service"
+      - dependency-name: "kv_storage_shared_preferences"
+      - dependency-name: "core"
+      - dependency-name: "ui_kit"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c4a7565..8fd9583 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: deploy
+name: cd
 
 # Run this workflow when a new release is published
 on:
@@ -11,7 +11,7 @@ jobs:
     steps:
       # 1. Checkout the repository code
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # 2. Setup Flutter SDK
       - name: Setup Flutter
@@ -25,11 +25,11 @@ jobs:
 
       # 4. Build the Flutter web app
       - name: Build Web App
-        run: flutter build web --release --base-href /ht-main/
+        run: flutter build web --release --base-href /flutter-news-app-mobile-client-full-source-code/
 
       # 5. Deploy the built app to GitHub Pages
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./build/web
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 696e5af..83be8c3 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -1,4 +1,4 @@
-name: ht_main
+name: ci
 
 concurrency:
   group: $-$
diff --git a/README.md b/README.md
index 87bdb29..07c7245 100644
--- a/README.md
+++ b/README.md
@@ -1,91 +1,106 @@
-# 📱✨ ht_main
+# The Complete Flutter News App - Full Source Code
 
 ![coverage: percentage](https://img.shields.io/badge/coverage-XX-green)
-[![Demo: Live](https://img.shields.io/badge/Demo-Live-orange)](https://headlines-toolkit.github.io/ht-main/)
+[![Demo: Live](https://img.shields.io/badge/Demo-Live-orange)](https://flutter-news-app-full-source-code.github.io/flutter-news-app-mobile-client-full-source-code/)
 [![style: very good analysis](https://img.shields.io/badge/style-very_good_analysis-B22C89.svg)](https://pub.dev/packages/very_good_analysis)
 [![License: PolyForm Free Trial](https://img.shields.io/badge/License-PolyForm%20Free%20Trial-blue)](https://polyformproject.org/licenses/free-trial/1.0.0)
 
-`ht_main` is a flutter mobile application that serves as both a powerful, fully functional news application ready for deployment, and an exceptionally robust starter kit, architected for easy extension and customization. It is a key component of the [Headlines Toolkit](https://github.com/headlines-toolkit), an ecosystem that also includes a [Dart Frog backend API](https://github.com/headlines-toolkit/ht-api) and a [web-based content dashboard](https://github.com/headlines-toolkit/ht-dashboard).
+This is a complete and fully-functional Flutter news application. It gives you everything you need to launch your own news app on the App Store and Google Play, right out of the box. It is a key component of the [**Flutter News App - Full Source Code Toolkit**](https://github.com/flutter-news-app-full-source-code), an ecosystem that also includes a [Dart Frog backend API](https://github.com/flutter-news-app-full-source-code/flutter-news-app-api-server-full-source-code) and a [web-based content dashboard](https://github.com/flutter-news-app-full-source-code/flutter-news-app-web-dashboard-full-source-code).
 
-## ⭐ Features & Benefits
+## ⭐ Everything You Get, Ready to Go
 
-`ht_main` comes packed with features to accelerate your development and delight your users:
+This app comes packed with all the features you need to launch a professional news application.
 
 #### 📰 **Dynamic & Engaging Headlines Feed**
-Experience a beautifully crafted, infinitely scrolling news feed. It's highly performant and ready for your content.
-*   **Benefit for you:** Save months of UI/UX development and complex state management. Get a production-quality feed system instantly! ⏱️
+*   Display news in a beautiful, performant, infinitely scrolling feed.
+*   Strategically display in-feed messages to drive user actions. Show calls-to-action like 'Create an Account' to anonymous users or 'Upgrade to Premium' to authenticated users, all based on configurable rules.
+> **Your Advantage:** You get a production-quality feed system instantly. Skip the months of complex UI work and state management. ⏱️
 
 #### 🔍 **Advanced Content Filtering & Search**
-Empower users with intuitive filtering for headlines by categories, sources, and countries. A dedicated search page helps users find exactly what they're looking for.
-*   **Benefit for you:** Offer powerful content discovery tools that significantly enhance user engagement and satisfaction. 🎯
+*   Let users filter headlines by categories, sources, and countries.
+*   Includes a dedicated search page to help users find specific content quickly.
+> **Your Advantage:** Give your users powerful content discovery tools that keep them engaged and coming back for more. 🎯
 
 #### 🔐 **Robust User Authentication**
 Secure and flexible authentication flows are built-in:
 *   📧 **Email + Code (Passwordless) Sign-In:** Modern and secure.
 *   👤 **Anonymous Sign-In:** Allow users to explore before committing.
 *   🔗 **Account Linking:** Seamlessly convert anonymous users to registered accounts, preserving all their personalized settings, content preferences, and saved headlines.
-*   **Benefit for you:** Complex security and user management handled, including data migration during account linking, letting you focus on features. ✅
+> **Your Advantage:** All the complex security and user management is already done for you, including data migration when users link their accounts. ✅
 
 #### 🧑‍🎨 **Personalized User Accounts & Preferences**
 Users can tailor their experience:
 *   **Content Preferences:** Follow/unfollow categories, sources, and countries.
 *   **Saved Headlines:** Bookmark articles for easy access later.
-*   **Benefit for you:** A strong foundation for personalization, driving user retention and creating a sticky app experience. ❤️
+> **Your Advantage:** Built-in personalization features that drive user retention and create a sticky app experience. ❤️
 
 #### ⚙️ **Customizable App Settings**
 Offer users control over their app experience:
 *   **Appearance:** Light/Dark/System themes, accent colors (via FlexColorScheme), font choices, and text scaling.
 *   **Feed Display:** Customize how headlines are presented.
-*   **Benefit for you:** Provide a premium, adaptable user experience that caters to individual needs. 🔧
+> **Your Advantage:** Deliver a premium, adaptable user experience that caters to individual needs without writing any code. 🔧
 
 #### 📱 **Adaptive UI for All Screens**
-Built with `flutter_adaptive_scaffold`, `ht_main` offers responsive navigation and layouts that look great on both phones and tablets.
-*   **Benefit for you:** Deliver a consistent and optimized UX across a wide range of devices effortlessly. ↔️
+Built with `flutter_adaptive_scaffold`, the app offers responsive navigation and layouts that look great on both phones and tablets.
+> **Your Advantage:** Deliver a consistent and optimized UX across a wide range of devices effortlessly. ↔️
 
 #### 🏗️ **Clean & Modern Architecture**
 Developed with best practices for a maintainable and scalable codebase:
 *   **Flutter & Dart:** Cutting-edge mobile development.
 *   **BLoC Pattern:** Predictable and robust state management.
 *   **GoRouter:** Well-structured and powerful navigation.
-*   **Benefit for you:** An easy-to-understand, extendable, and testable foundation for your project. 📈
+> **Your Advantage:** The app is built on a clean, modern architecture that's easy to understand and maintain. It's solid and built to last. 📈
 
 #### ⚙️ **Flexible Environment Configuration**
 Easily switch between development (in-memory data or local API) and production environments with a simple code change. This empowers rapid prototyping, robust testing, and seamless deployment.
-*   **Benefit for you:** Accelerate your development cycle and ensure your app is always ready for any deployment scenario. 🚀
+> **Your Advantage:** A flexible setup that speeds up your development cycle and makes deployment simple. 🚀
 
 #### 🌍 **Localization Ready**
 Fully internationalized with working English and Arabic localizations (`.arb` files). Adding more languages is straightforward.
-*   **Benefit for you:** Easily adapt your application for a global audience. 🌐
+> **Your Advantage:** Easily adapt your application for a global audience and tap into new markets. 🌐
 
 ---
 
-## 🔑 Access and Licensing
+## 🔑 Licensing
 
-`ht-main` is source-available as part of the Headlines Toolkit ecosystem.
+This app is source-available and licensed under the [PolyForm Free Trial 1.0.0](LICENSE). This lets you try out the full source code before you buy.
+
+For a commercial license to build and distribute your app, please visit the main [**Flutter News App - Full Source Code Toolkit**](https://github.com/flutter-news-app-full-source-code) organization.
 
-To acquire a commercial license for building unlimited news applications, please visit 
-the [Headlines Toolkit GitHub organization page](https://github.com/headlines-toolkit)
-for more details.
 
 ---
 
-## 🚀 Getting Started
+## 🚀 Getting Started & Running Locally
 
 1.  **Ensure Flutter is installed.** (See [Flutter documentation](https://flutter.dev/docs/get-started/install))
 2.  **Clone the repository:**
     ```bash
-    git clone https://github.com/headlines-toolkit/ht-main.git
-    cd ht-main
+    git clone https://github.com/flutter-news-app-full-source-code/flutter-news-app-mobile-client-full-source-code.git
+    cd flutter-news-app-mobile-client-full-source-code
     ```
 3.  **Get dependencies:**
     ```bash
     flutter pub get
     ```
 4.  **Run the app:**
-    ```bash
-    flutter run
-    ```
-    *(Note: For full functionality, ensure the `ht-api` backend service is running and accessible.)*
+
+### Running the App
+
+To run the app, first select your desired environment in `lib/main.dart`:
+
+```dart
+// lib/main.dart
+
+// Use `AppEnvironment.demo` to run with in-memory data (no API needed).
+// Use `AppEnvironment.development` to connect to a local backend API.
+const appEnvironment = AppEnvironment.demo; 
+```
+
+Then, run the app from your terminal:
+```bash
+flutter run
+```
+*(Note: For `development` environment, ensure the [backend service](https://github.com/flutter-news-app-full-source-code/flutter-news-app-api-server-full-source-code) is running.)*
 
 ---
 
@@ -96,4 +111,3 @@ This project aims for high test coverage to ensure quality and reliability.
 *   Run tests with:
     ```bash
     flutter test
-    ```
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 43f21e2..6e25ba0 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.ht_main"
+    namespace = "com.example.flutter_news_app_mobile_client_full_source_code"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = "29.0.13113456"
 
@@ -24,7 +24,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.ht_main"
+        applicationId = "com.example.flutter_news_app_mobile_client_full_source_code"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 24
diff --git a/android/app/google-services.json b/android/app/google-services.json
index 79b6843..0b03b1f 100644
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -1,15 +1,15 @@
 {
   "project_info": {
     "project_number": "420644261437",
-    "project_id": "headlines-toolkit",
-    "storage_bucket": "headlines-toolkit.firebasestorage.app"
+    "project_id": "flutter-news-app-full-source-code",
+    "storage_bucket": "flutter-news-app-full-source-code.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
         "mobilesdk_app_id": "1:420644261437:android:3fa3052f883bf86958a454",
         "android_client_info": {
-          "package_name": "com.example.ht_main"
+          "package_name": "com.example.flutter_news_app_mobile_client_full_source_code"
         }
       },
       "oauth_client": [],
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 93a8073..d332d34 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="ht_main"
+        android:label="flutter_news_app_mobile_client_full_source_code"
         android:name="${applicationName}"
         android:icon="@mipmap/launcher_icon">
         <activity
@@ -30,7 +30,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
                 <!-- Accepts URIs that begin with your dynamic link domain -->
-                <data android:scheme="https" android:host="htmain.page.link" />
+                <data android:scheme="https" android:host="flutter-news-app-full-source-code.page.link" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/kotlin/com/example/ht_main/MainActivity.kt b/android/app/src/main/kotlin/com/example/ht_main/MainActivity.kt
index 3b0ad77..1e81b3a 100644
--- a/android/app/src/main/kotlin/com/example/ht_main/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/ht_main/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.ht_main
+package com.example.flutter_news_app_mobile_client_full_source_code
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/lib/account/bloc/account_bloc.dart b/lib/account/bloc/account_bloc.dart
index 1e0984e..fce99f9 100644
--- a/lib/account/bloc/account_bloc.dart
+++ b/lib/account/bloc/account_bloc.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 
+import 'package:auth_repository/auth_repository.dart';
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_auth_repository/ht_auth_repository.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/app/config/config.dart' as local_config;
-import 'package:ht_shared/ht_shared.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
+    as local_config;
 import 'package:logging/logging.dart';
 
 part 'account_event.dart';
@@ -13,8 +14,8 @@ part 'account_state.dart';
 
 class AccountBloc extends Bloc<AccountEvent, AccountState> {
   AccountBloc({
-    required HtAuthRepository authenticationRepository,
-    required HtDataRepository<UserContentPreferences>
+    required AuthRepository authenticationRepository,
+    required DataRepository<UserContentPreferences>
     userContentPreferencesRepository,
     required local_config.AppEnvironment environment,
     Logger? logger,
@@ -23,7 +24,7 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
        _environment = environment,
        _logger = logger ?? Logger('AccountBloc'),
        super(const AccountState()) {
-    // Listen to user changes from HtAuthRepository
+    // Listen to user changes from AuthRepository
     _userSubscription = _authenticationRepository.authStateChanges.listen((
       user,
     ) {
@@ -39,8 +40,8 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
     on<AccountClearUserPreferences>(_onAccountClearUserPreferences);
   }
 
-  final HtAuthRepository _authenticationRepository;
-  final HtDataRepository<UserContentPreferences>
+  final AuthRepository _authenticationRepository;
+  final DataRepository<UserContentPreferences>
   _userContentPreferencesRepository;
   final local_config.AppEnvironment _environment;
   final Logger _logger;
@@ -149,9 +150,9 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
             clearError: true,
           ),
         );
-      } on HtHttpException catch (e) {
+      } on HttpException catch (e) {
         _logger.severe(
-          'Failed to create default preferences with HtHttpException: $e',
+          'Failed to create default preferences with HttpException: $e',
         );
         emit(state.copyWith(status: AccountStatus.failure, error: e));
       } catch (e, st) {
@@ -169,9 +170,9 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       _logger.severe(
-        'AccountLoadUserPreferences failed with HtHttpException: $e',
+        'AccountLoadUserPreferences failed with HttpException: $e',
       );
       emit(state.copyWith(status: AccountStatus.failure, error: e));
     } catch (e, st) {
@@ -227,9 +228,9 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       _logger.severe(
-        'AccountSaveHeadlineToggled failed with HtHttpException: $e',
+        'AccountSaveHeadlineToggled failed with HttpException: $e',
       );
       emit(state.copyWith(status: AccountStatus.failure, error: e));
     } catch (e, st) {
@@ -284,10 +285,8 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
-      _logger.severe(
-        'AccountFollowTopicToggled failed with HtHttpException: $e',
-      );
+    } on HttpException catch (e) {
+      _logger.severe('AccountFollowTopicToggled failed with HttpException: $e');
       emit(state.copyWith(status: AccountStatus.failure, error: e));
     } catch (e, st) {
       _logger.severe(
@@ -344,9 +343,9 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       _logger.severe(
-        'AccountFollowSourceToggled failed with HtHttpException: $e',
+        'AccountFollowSourceToggled failed with HttpException: $e',
       );
       emit(state.copyWith(status: AccountStatus.failure, error: e));
     } catch (e, st) {
@@ -392,9 +391,9 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       _logger.severe(
-        'AccountClearUserPreferences failed with HtHttpException: $e',
+        'AccountClearUserPreferences failed with HttpException: $e',
       );
       emit(state.copyWith(status: AccountStatus.failure, error: e));
     } catch (e, st) {
diff --git a/lib/account/bloc/account_state.dart b/lib/account/bloc/account_state.dart
index 4caab16..b1c3a32 100644
--- a/lib/account/bloc/account_state.dart
+++ b/lib/account/bloc/account_state.dart
@@ -13,13 +13,13 @@ class AccountState extends Equatable {
   final AccountStatus status;
   final User? user;
   final UserContentPreferences? preferences;
-  final HtHttpException? error;
+  final HttpException? error;
 
   AccountState copyWith({
     AccountStatus? status,
     User? user,
     UserContentPreferences? preferences,
-    HtHttpException? error,
+    HttpException? error,
     bool clearUser = false,
     bool clearPreferences = false,
     bool clearError = false,
diff --git a/lib/account/bloc/available_sources_bloc.dart b/lib/account/bloc/available_sources_bloc.dart
index a5670be..ed9666b 100644
--- a/lib/account/bloc/available_sources_bloc.dart
+++ b/lib/account/bloc/available_sources_bloc.dart
@@ -1,22 +1,22 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart' show HttpException, Source;
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart' show HtHttpException, Source;
 
 part 'available_sources_event.dart';
 part 'available_sources_state.dart';
 
 class AvailableSourcesBloc
     extends Bloc<AvailableSourcesEvent, AvailableSourcesState> {
-  AvailableSourcesBloc({required HtDataRepository<Source> sourcesRepository})
+  AvailableSourcesBloc({required DataRepository<Source> sourcesRepository})
     : _sourcesRepository = sourcesRepository,
       super(const AvailableSourcesState()) {
     on<FetchAvailableSources>(_onFetchAvailableSources);
   }
 
-  final HtDataRepository<Source> _sourcesRepository;
+  final DataRepository<Source> _sourcesRepository;
   // Consider adding a limit if the number of sources can be very large.
   // static const _sourcesLimit = 50;
 
@@ -46,7 +46,7 @@ class AvailableSourcesBloc
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(
         state.copyWith(
           status: AvailableSourcesStatus.failure,
diff --git a/lib/account/bloc/available_topics_bloc.dart b/lib/account/bloc/available_topics_bloc.dart
index 4c8e876..d84b756 100644
--- a/lib/account/bloc/available_topics_bloc.dart
+++ b/lib/account/bloc/available_topics_bloc.dart
@@ -1,22 +1,22 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 part 'available_topics_event.dart';
 part 'available_topics_state.dart';
 
 class AvailableTopicsBloc
     extends Bloc<AvailableTopicsEvent, AvailableTopicsState> {
-  AvailableTopicsBloc({required HtDataRepository<Topic> topicsRepository})
+  AvailableTopicsBloc({required DataRepository<Topic> topicsRepository})
     : _topicsRepository = topicsRepository,
       super(const AvailableTopicsState()) {
     on<FetchAvailableTopics>(_onFetchAvailableTopics);
   }
 
-  final HtDataRepository<Topic> _topicsRepository;
+  final DataRepository<Topic> _topicsRepository;
 
   Future<void> _onFetchAvailableTopics(
     FetchAvailableTopics event,
@@ -36,7 +36,7 @@ class AvailableTopicsBloc
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(
         state.copyWith(status: AvailableTopicsStatus.failure, error: e.message),
       );
diff --git a/lib/account/view/account_page.dart b/lib/account/view/account_page.dart
index 38b02c5..cf80745 100644
--- a/lib/account/view/account_page.dart
+++ b/lib/account/view/account_page.dart
@@ -1,12 +1,12 @@
+import 'package:core/core.dart' hide AppStatus;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart' hide AppStatus;
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template account_view}
 /// Displays the user's account information and actions.
diff --git a/lib/account/view/manage_followed_items/manage_followed_items_page.dart b/lib/account/view/manage_followed_items/manage_followed_items_page.dart
index d37208f..066bbc6 100644
--- a/lib/account/view/manage_followed_items/manage_followed_items_page.dart
+++ b/lib/account/view/manage_followed_items/manage_followed_items_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template manage_followed_items_page}
 /// Page for navigating to lists of followed content types like
diff --git a/lib/account/view/manage_followed_items/sources/add_source_to_follow_page.dart b/lib/account/view/manage_followed_items/sources/add_source_to_follow_page.dart
index da44590..99a592a 100644
--- a/lib/account/view/manage_followed_items/sources/add_source_to_follow_page.dart
+++ b/lib/account/view/manage_followed_items/sources/add_source_to_follow_page.dart
@@ -1,11 +1,11 @@
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/account/bloc/available_sources_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/available_sources_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template add_source_to_follow_page}
 /// A page that allows users to browse and select sources to follow.
@@ -19,7 +19,7 @@ class AddSourceToFollowPage extends StatelessWidget {
     final l10n = AppLocalizationsX(context).l10n;
     return BlocProvider(
       create: (context) => AvailableSourcesBloc(
-        sourcesRepository: context.read<HtDataRepository<Source>>(),
+        sourcesRepository: context.read<DataRepository<Source>>(),
       )..add(const FetchAvailableSources()),
       child: Scaffold(
         appBar: AppBar(title: Text(l10n.addSourcesPageTitle)),
diff --git a/lib/account/view/manage_followed_items/sources/followed_sources_list_page.dart b/lib/account/view/manage_followed_items/sources/followed_sources_list_page.dart
index a92ee14..024efa3 100644
--- a/lib/account/view/manage_followed_items/sources/followed_sources_list_page.dart
+++ b/lib/account/view/manage_followed_items/sources/followed_sources_list_page.dart
@@ -1,12 +1,12 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template followed_sources_list_page}
 /// Page to display and manage sources followed by the user.
diff --git a/lib/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart b/lib/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart
index fe81b9b..601ec94 100644
--- a/lib/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart
+++ b/lib/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart
@@ -1,11 +1,11 @@
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/account/bloc/available_topics_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/available_topics_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template add_topic_to_follow_page}
 /// A page that allows users to browse and select topics to follow.
@@ -22,7 +22,7 @@ class AddTopicToFollowPage extends StatelessWidget {
 
     return BlocProvider(
       create: (context) => AvailableTopicsBloc(
-        topicsRepository: context.read<HtDataRepository<Topic>>(),
+        topicsRepository: context.read<DataRepository<Topic>>(),
       )..add(const FetchAvailableTopics()),
       child: Scaffold(
         appBar: AppBar(
diff --git a/lib/account/view/manage_followed_items/topics/followed_topics_list_page.dart b/lib/account/view/manage_followed_items/topics/followed_topics_list_page.dart
index a5e6e94..00eee59 100644
--- a/lib/account/view/manage_followed_items/topics/followed_topics_list_page.dart
+++ b/lib/account/view/manage_followed_items/topics/followed_topics_list_page.dart
@@ -1,12 +1,12 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template followed_topics_list_page}
 /// Page to display and manage topics followed by the user.
diff --git a/lib/account/view/saved_headlines_page.dart b/lib/account/view/saved_headlines_page.dart
index d545b92..58f2541 100644
--- a/lib/account/view/saved_headlines_page.dart
+++ b/lib/account/view/saved_headlines_page.dart
@@ -1,14 +1,14 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 // HeadlineItemWidget import removed
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/shared/shared.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template saved_headlines_page}
 /// Displays the list of headlines saved by the user.
diff --git a/lib/app/bloc/app_bloc.dart b/lib/app/bloc/app_bloc.dart
index a26ae9c..52bc974 100644
--- a/lib/app/bloc/app_bloc.dart
+++ b/lib/app/bloc/app_bloc.dart
@@ -1,23 +1,24 @@
 import 'dart:async';
 
+import 'package:auth_repository/auth_repository.dart';
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flex_color_scheme/flex_color_scheme.dart';
 import 'package:flutter/material.dart';
-import 'package:ht_auth_repository/ht_auth_repository.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/app/config/config.dart' as local_config;
-import 'package:ht_main/app/services/demo_data_migration_service.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
+    as local_config;
+import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
 
 part 'app_event.dart';
 part 'app_state.dart';
 
 class AppBloc extends Bloc<AppEvent, AppState> {
   AppBloc({
-    required HtAuthRepository authenticationRepository,
-    required HtDataRepository<UserAppSettings> userAppSettingsRepository,
-    required HtDataRepository<RemoteConfig> appConfigRepository,
+    required AuthRepository authenticationRepository,
+    required DataRepository<UserAppSettings> userAppSettingsRepository,
+    required DataRepository<RemoteConfig> appConfigRepository,
     required local_config.AppEnvironment environment,
     this.demoDataMigrationService,
   }) : _authenticationRepository = authenticationRepository,
@@ -66,9 +67,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     );
   }
 
-  final HtAuthRepository _authenticationRepository;
-  final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
-  final HtDataRepository<RemoteConfig> _appConfigRepository;
+  final AuthRepository _authenticationRepository;
+  final DataRepository<UserAppSettings> _userAppSettingsRepository;
+  final DataRepository<RemoteConfig> _appConfigRepository;
   final local_config.AppEnvironment _environment;
   final DemoDataMigrationService? demoDataMigrationService;
   late final StreamSubscription<User?> _userSubscription;
@@ -449,9 +450,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {
           status: newStatusBasedOnUser,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       print(
-        '[AppBloc] Failed to fetch AppConfig (HtHttpException) for user ${state.user?.id}: ${e.runtimeType} - ${e.message}',
+        '[AppBloc] Failed to fetch AppConfig (HttpException) for user ${state.user?.id}: ${e.runtimeType} - ${e.message}',
       );
       emit(
         state.copyWith(
@@ -505,7 +506,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
       // Emit the change so UI can react if needed, and other BLoCs get the update.
       emit(state.copyWith(user: updatedUser));
 
-      // TODO: Persist this change to the backend.
+      // TODO(fulleni): Persist this change to the backend.
       // This would typically involve calling a method on a repository, e.g.:
       // try {
       //   await _authenticationRepository.updateUserFeedActionStatus(
@@ -536,7 +537,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
       return;
     }
 
-    // TODO(ht-development): Get the current app version from a package like
+    // TODO(fulleni): Get the current app version from a package like
     // package_info_plus and compare it with appStatus.latestAppVersion.
     if (appStatus.isLatestVersionOnly) {
       emit(state.copyWith(status: AppStatus.updateRequired));
diff --git a/lib/app/config/app_config.dart b/lib/app/config/app_config.dart
index 9310dc6..2f23aa1 100644
--- a/lib/app/config/app_config.dart
+++ b/lib/app/config/app_config.dart
@@ -1,4 +1,4 @@
-import 'package:ht_main/app/config/app_environment.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/app_environment.dart';
 
 class AppConfig {
   const AppConfig({
diff --git a/lib/app/services/demo_data_migration_service.dart b/lib/app/services/demo_data_migration_service.dart
index 760cbfd..58e8456 100644
--- a/lib/app/services/demo_data_migration_service.dart
+++ b/lib/app/services/demo_data_migration_service.dart
@@ -1,5 +1,5 @@
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 
 /// {@template demo_data_migration_service}
 /// A service responsible for migrating user data (settings and preferences)
@@ -12,14 +12,14 @@ import 'package:ht_shared/ht_shared.dart';
 class DemoDataMigrationService {
   /// {@macro demo_data_migration_service}
   const DemoDataMigrationService({
-    required HtDataRepository<UserAppSettings> userAppSettingsRepository,
-    required HtDataRepository<UserContentPreferences>
+    required DataRepository<UserAppSettings> userAppSettingsRepository,
+    required DataRepository<UserContentPreferences>
     userContentPreferencesRepository,
   }) : _userAppSettingsRepository = userAppSettingsRepository,
        _userContentPreferencesRepository = userContentPreferencesRepository;
 
-  final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
-  final HtDataRepository<UserContentPreferences>
+  final DataRepository<UserAppSettings> _userAppSettingsRepository;
+  final DataRepository<UserContentPreferences>
   _userContentPreferencesRepository;
 
   /// Migrates user settings and content preferences from an old anonymous
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
index a37c481..3a0ee34 100644
--- a/lib/app/view/app.dart
+++ b/lib/app/view/app.dart
@@ -1,35 +1,35 @@
+import 'package:auth_repository/auth_repository.dart';
+import 'package:core/core.dart' hide AppStatus;
+import 'package:data_repository/data_repository.dart';
 import 'package:flex_color_scheme/flex_color_scheme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/app_environment.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/router.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_auth_repository/ht_auth_repository.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_kv_storage_service/ht_kv_storage_service.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/app/config/app_environment.dart';
-import 'package:ht_main/app/services/demo_data_migration_service.dart';
-import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
-import 'package:ht_main/l10n/app_localizations.dart';
-import 'package:ht_main/router/router.dart';
-import 'package:ht_shared/ht_shared.dart' hide AppStatus;
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:kv_storage_service/kv_storage_service.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 class App extends StatelessWidget {
   const App({
-    required HtAuthRepository htAuthenticationRepository,
-    required HtDataRepository<Headline> htHeadlinesRepository,
-    required HtDataRepository<Topic> htTopicsRepository,
-    required HtDataRepository<Country> htCountriesRepository,
-    required HtDataRepository<Source> htSourcesRepository,
-    required HtDataRepository<UserAppSettings> htUserAppSettingsRepository,
-    required HtDataRepository<UserContentPreferences>
+    required AuthRepository authenticationRepository,
+    required DataRepository<Headline> htHeadlinesRepository,
+    required DataRepository<Topic> htTopicsRepository,
+    required DataRepository<Country> htCountriesRepository,
+    required DataRepository<Source> htSourcesRepository,
+    required DataRepository<UserAppSettings> htUserAppSettingsRepository,
+    required DataRepository<UserContentPreferences>
     htUserContentPreferencesRepository,
-    required HtDataRepository<RemoteConfig> htRemoteConfigRepository,
-    required HtKVStorageService kvStorageService,
+    required DataRepository<RemoteConfig> htRemoteConfigRepository,
+    required KVStorageService kvStorageService,
     required AppEnvironment environment,
     this.demoDataMigrationService,
     super.key,
-  }) : _htAuthenticationRepository = htAuthenticationRepository,
+  }) : _authenticationRepository = authenticationRepository,
        _htHeadlinesRepository = htHeadlinesRepository,
        _htTopicsRepository = htTopicsRepository,
        _htCountriesRepository = htCountriesRepository,
@@ -40,16 +40,16 @@ class App extends StatelessWidget {
        _kvStorageService = kvStorageService,
        _environment = environment;
 
-  final HtAuthRepository _htAuthenticationRepository;
-  final HtDataRepository<Headline> _htHeadlinesRepository;
-  final HtDataRepository<Topic> _htTopicsRepository;
-  final HtDataRepository<Country> _htCountriesRepository;
-  final HtDataRepository<Source> _htSourcesRepository;
-  final HtDataRepository<UserAppSettings> _htUserAppSettingsRepository;
-  final HtDataRepository<UserContentPreferences>
+  final AuthRepository _authenticationRepository;
+  final DataRepository<Headline> _htHeadlinesRepository;
+  final DataRepository<Topic> _htTopicsRepository;
+  final DataRepository<Country> _htCountriesRepository;
+  final DataRepository<Source> _htSourcesRepository;
+  final DataRepository<UserAppSettings> _htUserAppSettingsRepository;
+  final DataRepository<UserContentPreferences>
   _htUserContentPreferencesRepository;
-  final HtDataRepository<RemoteConfig> _htAppConfigRepository;
-  final HtKVStorageService _kvStorageService;
+  final DataRepository<RemoteConfig> _htAppConfigRepository;
+  final KVStorageService _kvStorageService;
   final AppEnvironment _environment;
   final DemoDataMigrationService? demoDataMigrationService;
 
@@ -57,7 +57,7 @@ class App extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiRepositoryProvider(
       providers: [
-        RepositoryProvider.value(value: _htAuthenticationRepository),
+        RepositoryProvider.value(value: _authenticationRepository),
         RepositoryProvider.value(value: _htHeadlinesRepository),
         RepositoryProvider.value(value: _htTopicsRepository),
         RepositoryProvider.value(value: _htCountriesRepository),
@@ -71,23 +71,22 @@ class App extends StatelessWidget {
         providers: [
           BlocProvider(
             create: (context) => AppBloc(
-              authenticationRepository: context.read<HtAuthRepository>(),
+              authenticationRepository: context.read<AuthRepository>(),
               userAppSettingsRepository: context
-                  .read<HtDataRepository<UserAppSettings>>(),
-              appConfigRepository: context
-                  .read<HtDataRepository<RemoteConfig>>(),
+                  .read<DataRepository<UserAppSettings>>(),
+              appConfigRepository: context.read<DataRepository<RemoteConfig>>(),
               environment: _environment,
               demoDataMigrationService: demoDataMigrationService,
             ),
           ),
           BlocProvider(
             create: (context) => AuthenticationBloc(
-              authenticationRepository: context.read<HtAuthRepository>(),
+              authenticationRepository: context.read<AuthRepository>(),
             ),
           ),
         ],
         child: _AppView(
-          htAuthenticationRepository: _htAuthenticationRepository,
+          authenticationRepository: _authenticationRepository,
           htHeadlinesRepository: _htHeadlinesRepository,
           htTopicRepository: _htTopicsRepository,
           htCountriesRepository: _htCountriesRepository,
@@ -105,7 +104,7 @@ class App extends StatelessWidget {
 
 class _AppView extends StatefulWidget {
   const _AppView({
-    required this.htAuthenticationRepository,
+    required this.authenticationRepository,
     required this.htHeadlinesRepository,
     required this.htTopicRepository,
     required this.htCountriesRepository,
@@ -116,15 +115,15 @@ class _AppView extends StatefulWidget {
     required this.environment,
   });
 
-  final HtAuthRepository htAuthenticationRepository;
-  final HtDataRepository<Headline> htHeadlinesRepository;
-  final HtDataRepository<Topic> htTopicRepository;
-  final HtDataRepository<Country> htCountriesRepository;
-  final HtDataRepository<Source> htSourcesRepository;
-  final HtDataRepository<UserAppSettings> htUserAppSettingsRepository;
-  final HtDataRepository<UserContentPreferences>
+  final AuthRepository authenticationRepository;
+  final DataRepository<Headline> htHeadlinesRepository;
+  final DataRepository<Topic> htTopicRepository;
+  final DataRepository<Country> htCountriesRepository;
+  final DataRepository<Source> htSourcesRepository;
+  final DataRepository<UserAppSettings> htUserAppSettingsRepository;
+  final DataRepository<UserContentPreferences>
   htUserContentPreferencesRepository;
-  final HtDataRepository<RemoteConfig> htAppConfigRepository;
+  final DataRepository<RemoteConfig> htAppConfigRepository;
   final AppEnvironment environment;
 
   @override
@@ -145,7 +144,7 @@ class _AppViewState extends State<_AppView> {
     _statusNotifier = ValueNotifier<AppStatus>(appBloc.state.status);
     _router = createRouter(
       authStatusNotifier: _statusNotifier,
-      htAuthenticationRepository: widget.htAuthenticationRepository,
+      authenticationRepository: widget.authenticationRepository,
       htHeadlinesRepository: widget.htHeadlinesRepository,
       htTopicsRepository: widget.htTopicRepository,
       htCountriesRepository: widget.htCountriesRepository,
@@ -205,11 +204,11 @@ class _AppViewState extends State<_AppView> {
                   .themeMode, // Still respect light/dark if available from system
               localizationsDelegates: const [
                 ...AppLocalizations.localizationsDelegates,
-                ...HtUiKitLocalizations.localizationsDelegates,
+                ...UiKitLocalizations.localizationsDelegates,
               ],
               supportedLocales: const [
                 ...AppLocalizations.supportedLocales,
-                ...HtUiKitLocalizations.supportedLocales,
+                ...UiKitLocalizations.supportedLocales,
               ],
               home: Scaffold(
                 body: Builder(
@@ -246,11 +245,11 @@ class _AppViewState extends State<_AppView> {
               themeMode: state.themeMode,
               localizationsDelegates: const [
                 ...AppLocalizations.localizationsDelegates,
-                ...HtUiKitLocalizations.localizationsDelegates,
+                ...UiKitLocalizations.localizationsDelegates,
               ],
               supportedLocales: const [
                 ...AppLocalizations.supportedLocales,
-                ...HtUiKitLocalizations.supportedLocales,
+                ...UiKitLocalizations.supportedLocales,
               ],
               home: Scaffold(
                 body: Builder(
@@ -258,7 +257,7 @@ class _AppViewState extends State<_AppView> {
                   builder: (innerContext) {
                     return FailureStateWidget(
                       exception: const NetworkException(),
-                      retryButtonText: HtUiKitLocalizations.of(
+                      retryButtonText: UiKitLocalizations.of(
                         innerContext,
                       )!.retryButtonText,
                       onRetry: () {
@@ -308,11 +307,11 @@ class _AppViewState extends State<_AppView> {
             locale: state.locale,
             localizationsDelegates: const [
               ...AppLocalizations.localizationsDelegates,
-              ...HtUiKitLocalizations.localizationsDelegates,
+              ...UiKitLocalizations.localizationsDelegates,
             ],
             supportedLocales: const [
               ...AppLocalizations.supportedLocales,
-              ...HtUiKitLocalizations.supportedLocales,
+              ...UiKitLocalizations.supportedLocales,
             ],
           );
         },
diff --git a/lib/app/view/app_shell.dart b/lib/app/view/app_shell.dart
index 08ad06a..50c3047 100644
--- a/lib/app/view/app_shell.dart
+++ b/lib/app/view/app_shell.dart
@@ -3,8 +3,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/l10n/l10n.dart';
 
 /// A responsive scaffold shell for the main application sections.
 ///
diff --git a/lib/authentication/bloc/authentication_bloc.dart b/lib/authentication/bloc/authentication_bloc.dart
index 99f4207..7b02095 100644
--- a/lib/authentication/bloc/authentication_bloc.dart
+++ b/lib/authentication/bloc/authentication_bloc.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
+import 'package:auth_repository/auth_repository.dart';
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_auth_repository/ht_auth_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 part 'authentication_event.dart';
 part 'authentication_state.dart';
@@ -14,7 +14,7 @@ part 'authentication_state.dart';
 class AuthenticationBloc
     extends Bloc<AuthenticationEvent, AuthenticationState> {
   /// {@macro authentication_bloc}
-  AuthenticationBloc({required HtAuthRepository authenticationRepository})
+  AuthenticationBloc({required AuthRepository authenticationRepository})
     : _authenticationRepository = authenticationRepository,
       super(const AuthenticationState()) {
     // Listen to authentication state changes from the repository
@@ -33,7 +33,7 @@ class AuthenticationBloc
     on<AuthenticationSignOutRequested>(_onAuthenticationSignOutRequested);
   }
 
-  final HtAuthRepository _authenticationRepository;
+  final AuthRepository _authenticationRepository;
   late final StreamSubscription<User?> _userAuthSubscription;
 
   /// Handles [_AuthenticationUserChanged] events.
@@ -72,7 +72,7 @@ class AuthenticationBloc
           email: event.email,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: AuthenticationStatus.failure, exception: e));
     } catch (e) {
       emit(
@@ -94,7 +94,7 @@ class AuthenticationBloc
       await _authenticationRepository.verifySignInCode(event.email, event.code);
       // On success, the _AuthenticationUserChanged listener will handle
       // emitting the authenticated state.
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: AuthenticationStatus.failure, exception: e));
     } catch (e) {
       emit(
@@ -116,7 +116,7 @@ class AuthenticationBloc
       await _authenticationRepository.signInAnonymously();
       // On success, the _AuthenticationUserChanged listener will handle
       // emitting the authenticated state.
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: AuthenticationStatus.failure, exception: e));
     } catch (e) {
       emit(
@@ -138,7 +138,7 @@ class AuthenticationBloc
       await _authenticationRepository.signOut();
       // On success, the _AuthenticationUserChanged listener will handle
       // emitting the unauthenticated state.
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: AuthenticationStatus.failure, exception: e));
     } catch (e) {
       emit(
diff --git a/lib/authentication/bloc/authentication_state.dart b/lib/authentication/bloc/authentication_state.dart
index 1e85f8b..690dbb8 100644
--- a/lib/authentication/bloc/authentication_state.dart
+++ b/lib/authentication/bloc/authentication_state.dart
@@ -51,14 +51,14 @@ class AuthenticationState extends Equatable {
   final String? email;
 
   /// The exception that occurred, if any.
-  final HtHttpException? exception;
+  final HttpException? exception;
 
   /// Creates a copy of the current [AuthenticationState] with updated values.
   AuthenticationState copyWith({
     AuthenticationStatus? status,
     User? user,
     String? email,
-    HtHttpException? exception,
+    HttpException? exception,
   }) {
     return AuthenticationState(
       status: status ?? this.status,
diff --git a/lib/authentication/view/authentication_page.dart b/lib/authentication/view/authentication_page.dart
index e6771e5..94a9ea9 100644
--- a/lib/authentication/view/authentication_page.dart
+++ b/lib/authentication/view/authentication_page.dart
@@ -3,11 +3,11 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template authentication_page}
 /// Displays authentication options (Google, Email, Anonymous) based on context.
diff --git a/lib/authentication/view/email_code_verification_page.dart b/lib/authentication/view/email_code_verification_page.dart
index 90e69bd..b6f9215 100644
--- a/lib/authentication/view/email_code_verification_page.dart
+++ b/lib/authentication/view/email_code_verification_page.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/app/config/config.dart';
-import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template email_code_verification_page}
 /// Page where the user enters the 6-digit code sent to their email
diff --git a/lib/authentication/view/request_code_page.dart b/lib/authentication/view/request_code_page.dart
index 64a589f..d4f43ca 100644
--- a/lib/authentication/view/request_code_page.dart
+++ b/lib/authentication/view/request_code_page.dart
@@ -3,11 +3,11 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template request_code_page}
 /// Page for initiating the email code sign-in process.
diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
index 6592a2a..29999c6 100644
--- a/lib/bootstrap.dart
+++ b/lib/bootstrap.dart
@@ -1,23 +1,24 @@
+import 'package:auth_api/auth_api.dart';
+import 'package:auth_client/auth_client.dart';
+import 'package:auth_inmemory/auth_inmemory.dart';
+import 'package:auth_repository/auth_repository.dart';
+import 'package:core/core.dart';
+import 'package:data_api/data_api.dart';
+import 'package:data_client/data_client.dart';
+import 'package:data_inmemory/data_inmemory.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_auth_api/ht_auth_api.dart';
-import 'package:ht_auth_client/ht_auth_client.dart';
-import 'package:ht_auth_inmemory/ht_auth_inmemory.dart';
-import 'package:ht_auth_repository/ht_auth_repository.dart';
-import 'package:ht_data_api/ht_data_api.dart';
-import 'package:ht_data_client/ht_data_client.dart';
-import 'package:ht_data_inmemory/ht_data_inmemory.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_http_client/ht_http_client.dart';
-import 'package:ht_kv_storage_shared_preferences/ht_kv_storage_shared_preferences.dart';
-import 'package:ht_main/app/app.dart';
-import 'package:ht_main/app/config/config.dart' as app_config;
-import 'package:ht_main/app/services/demo_data_migration_service.dart';
-import 'package:ht_main/bloc_observer.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/app.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
+    as app_config;
+import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/bloc_observer.dart';
+import 'package:http_client/http_client.dart';
+import 'package:kv_storage_shared_preferences/kv_storage_shared_preferences.dart';
 import 'package:logging/logging.dart';
 import 'package:timeago/timeago.dart' as timeago;
+import 'package:ui_kit/ui_kit.dart';
 
 Future<Widget> bootstrap(
   app_config.AppConfig appConfig,
@@ -31,126 +32,126 @@ Future<Widget> bootstrap(
 
   final logger = Logger('bootstrap');
 
-  final kvStorage = await HtKvStorageSharedPreferences.getInstance();
+  final kvStorage = await KVStorageSharedPreferences.getInstance();
 
-  late final HtAuthClient authClient;
-  late final HtAuthRepository authenticationRepository;
-  HtHttpClient? httpClient;
+  late final AuthClient authClient;
+  late final AuthRepository authenticationRepository;
+  HttpClient? httpClient;
 
   if (appConfig.environment == app_config.AppEnvironment.demo) {
-    authClient = HtAuthInmemory();
-    authenticationRepository = HtAuthRepository(
+    authClient = AuthInmemory();
+    authenticationRepository = AuthRepository(
       authClient: authClient,
       storageService: kvStorage,
     );
   } else {
     // For production and development environments, an HTTP client is needed.
-    httpClient = HtHttpClient(
+    httpClient = HttpClient(
       baseUrl: appConfig.baseUrl,
       tokenProvider: () => authenticationRepository.getAuthToken(),
       logger: logger,
     );
-    authClient = HtAuthApi(httpClient: httpClient);
-    authenticationRepository = HtAuthRepository(
+    authClient = AuthApi(httpClient: httpClient);
+    authenticationRepository = AuthRepository(
       authClient: authClient,
       storageService: kvStorage,
     );
   }
 
   // Conditional data client instantiation based on environment
-  HtDataClient<Headline> headlinesClient;
-  HtDataClient<Topic> topicsClient;
-  HtDataClient<Country> countriesClient;
-  HtDataClient<Source> sourcesClient;
-  HtDataClient<UserContentPreferences> userContentPreferencesClient;
-  HtDataClient<UserAppSettings> userAppSettingsClient;
-  HtDataClient<RemoteConfig> remoteConfigClient;
+  DataClient<Headline> headlinesClient;
+  DataClient<Topic> topicsClient;
+  DataClient<Country> countriesClient;
+  DataClient<Source> sourcesClient;
+  DataClient<UserContentPreferences> userContentPreferencesClient;
+  DataClient<UserAppSettings> userAppSettingsClient;
+  DataClient<RemoteConfig> remoteConfigClient;
 
   if (appConfig.environment == app_config.AppEnvironment.demo) {
-    headlinesClient = HtDataInMemory<Headline>(
+    headlinesClient = DataInMemory<Headline>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       initialData: headlinesFixturesData,
       logger: logger,
     );
-    topicsClient = HtDataInMemory<Topic>(
+    topicsClient = DataInMemory<Topic>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       initialData: topicsFixturesData,
       logger: logger,
     );
-    countriesClient = HtDataInMemory<Country>(
+    countriesClient = DataInMemory<Country>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       initialData: countriesFixturesData,
       logger: logger,
     );
-    sourcesClient = HtDataInMemory<Source>(
+    sourcesClient = DataInMemory<Source>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       initialData: sourcesFixturesData,
       logger: logger,
     );
-    userContentPreferencesClient = HtDataInMemory<UserContentPreferences>(
+    userContentPreferencesClient = DataInMemory<UserContentPreferences>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       logger: logger,
     );
-    userAppSettingsClient = HtDataInMemory<UserAppSettings>(
+    userAppSettingsClient = DataInMemory<UserAppSettings>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       logger: logger,
     );
-    remoteConfigClient = HtDataInMemory<RemoteConfig>(
+    remoteConfigClient = DataInMemory<RemoteConfig>(
       toJson: (i) => i.toJson(),
       getId: (i) => i.id,
       initialData: remoteConfigsFixturesData,
       logger: logger,
     );
   } else if (appConfig.environment == app_config.AppEnvironment.development) {
-    headlinesClient = HtDataApi<Headline>(
+    headlinesClient = DataApi<Headline>(
       httpClient: httpClient!,
       modelName: 'headline',
       fromJson: Headline.fromJson,
       toJson: (headline) => headline.toJson(),
       logger: logger,
     );
-    topicsClient = HtDataApi<Topic>(
+    topicsClient = DataApi<Topic>(
       httpClient: httpClient,
       modelName: 'topic',
       fromJson: Topic.fromJson,
       toJson: (topic) => topic.toJson(),
       logger: logger,
     );
-    countriesClient = HtDataApi<Country>(
+    countriesClient = DataApi<Country>(
       httpClient: httpClient,
       modelName: 'country',
       fromJson: Country.fromJson,
       toJson: (country) => country.toJson(),
       logger: logger,
     );
-    sourcesClient = HtDataApi<Source>(
+    sourcesClient = DataApi<Source>(
       httpClient: httpClient,
       modelName: 'source',
       fromJson: Source.fromJson,
       toJson: (source) => source.toJson(),
       logger: logger,
     );
-    userContentPreferencesClient = HtDataApi<UserContentPreferences>(
+    userContentPreferencesClient = DataApi<UserContentPreferences>(
       httpClient: httpClient,
       modelName: 'user_content_preferences',
       fromJson: UserContentPreferences.fromJson,
       toJson: (prefs) => prefs.toJson(),
       logger: logger,
     );
-    userAppSettingsClient = HtDataApi<UserAppSettings>(
+    userAppSettingsClient = DataApi<UserAppSettings>(
       httpClient: httpClient,
       modelName: 'user_app_settings',
       fromJson: UserAppSettings.fromJson,
       toJson: (settings) => settings.toJson(),
       logger: logger,
     );
-    remoteConfigClient = HtDataApi<RemoteConfig>(
+    remoteConfigClient = DataApi<RemoteConfig>(
       httpClient: httpClient,
       modelName: 'remote_config',
       fromJson: RemoteConfig.fromJson,
@@ -159,49 +160,49 @@ Future<Widget> bootstrap(
     );
   } else {
     // Default to API clients for production
-    headlinesClient = HtDataApi<Headline>(
+    headlinesClient = DataApi<Headline>(
       httpClient: httpClient!,
       modelName: 'headline',
       fromJson: Headline.fromJson,
       toJson: (headline) => headline.toJson(),
       logger: logger,
     );
-    topicsClient = HtDataApi<Topic>(
+    topicsClient = DataApi<Topic>(
       httpClient: httpClient,
       modelName: 'topic',
       fromJson: Topic.fromJson,
       toJson: (topic) => topic.toJson(),
       logger: logger,
     );
-    countriesClient = HtDataApi<Country>(
+    countriesClient = DataApi<Country>(
       httpClient: httpClient,
       modelName: 'country',
       fromJson: Country.fromJson,
       toJson: (country) => country.toJson(),
       logger: logger,
     );
-    sourcesClient = HtDataApi<Source>(
+    sourcesClient = DataApi<Source>(
       httpClient: httpClient,
       modelName: 'source',
       fromJson: Source.fromJson,
       toJson: (source) => source.toJson(),
       logger: logger,
     );
-    userContentPreferencesClient = HtDataApi<UserContentPreferences>(
+    userContentPreferencesClient = DataApi<UserContentPreferences>(
       httpClient: httpClient,
       modelName: 'user_content_preferences',
       fromJson: UserContentPreferences.fromJson,
       toJson: (prefs) => prefs.toJson(),
       logger: logger,
     );
-    userAppSettingsClient = HtDataApi<UserAppSettings>(
+    userAppSettingsClient = DataApi<UserAppSettings>(
       httpClient: httpClient,
       modelName: 'user_app_settings',
       fromJson: UserAppSettings.fromJson,
       toJson: (settings) => settings.toJson(),
       logger: logger,
     );
-    remoteConfigClient = HtDataApi<RemoteConfig>(
+    remoteConfigClient = DataApi<RemoteConfig>(
       httpClient: httpClient,
       modelName: 'remote_config',
       fromJson: RemoteConfig.fromJson,
@@ -210,22 +211,22 @@ Future<Widget> bootstrap(
     );
   }
 
-  final headlinesRepository = HtDataRepository<Headline>(
+  final headlinesRepository = DataRepository<Headline>(
     dataClient: headlinesClient,
   );
-  final topicsRepository = HtDataRepository<Topic>(dataClient: topicsClient);
-  final countriesRepository = HtDataRepository<Country>(
+  final topicsRepository = DataRepository<Topic>(dataClient: topicsClient);
+  final countriesRepository = DataRepository<Country>(
     dataClient: countriesClient,
   );
-  final sourcesRepository = HtDataRepository<Source>(dataClient: sourcesClient);
+  final sourcesRepository = DataRepository<Source>(dataClient: sourcesClient);
   final userContentPreferencesRepository =
-      HtDataRepository<UserContentPreferences>(
+      DataRepository<UserContentPreferences>(
         dataClient: userContentPreferencesClient,
       );
-  final userAppSettingsRepository = HtDataRepository<UserAppSettings>(
+  final userAppSettingsRepository = DataRepository<UserAppSettings>(
     dataClient: userAppSettingsClient,
   );
-  final remoteConfigRepository = HtDataRepository<RemoteConfig>(
+  final remoteConfigRepository = DataRepository<RemoteConfig>(
     dataClient: remoteConfigClient,
   );
 
@@ -239,7 +240,7 @@ Future<Widget> bootstrap(
       : null;
 
   return App(
-    htAuthenticationRepository: authenticationRepository,
+    authenticationRepository: authenticationRepository,
     htHeadlinesRepository: headlinesRepository,
     htTopicsRepository: topicsRepository,
     htCountriesRepository: countriesRepository,
diff --git a/lib/entity_details/bloc/entity_details_bloc.dart b/lib/entity_details/bloc/entity_details_bloc.dart
index 6208ca9..4efb756 100644
--- a/lib/entity_details/bloc/entity_details_bloc.dart
+++ b/lib/entity_details/bloc/entity_details_bloc.dart
@@ -3,21 +3,21 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/shared/services/feed_injector_service.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/services/feed_injector_service.dart';
 
 part 'entity_details_event.dart';
 part 'entity_details_state.dart';
 
 class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
   EntityDetailsBloc({
-    required HtDataRepository<Headline> headlinesRepository,
-    required HtDataRepository<Topic> topicRepository,
-    required HtDataRepository<Source> sourceRepository,
+    required DataRepository<Headline> headlinesRepository,
+    required DataRepository<Topic> topicRepository,
+    required DataRepository<Source> sourceRepository,
     required AccountBloc accountBloc,
     required AppBloc appBloc,
     required FeedInjectorService feedInjectorService,
@@ -47,9 +47,9 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
     });
   }
 
-  final HtDataRepository<Headline> _headlinesRepository;
-  final HtDataRepository<Topic> _topicRepository;
-  final HtDataRepository<Source> _sourceRepository;
+  final DataRepository<Headline> _headlinesRepository;
+  final DataRepository<Topic> _topicRepository;
+  final DataRepository<Source> _sourceRepository;
   final AccountBloc _accountBloc;
   final AppBloc _appBloc;
   final FeedInjectorService _feedInjectorService;
@@ -155,7 +155,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: EntityDetailsStatus.failure, exception: e));
     } catch (e) {
       emit(
@@ -248,7 +248,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(
         state.copyWith(
           status: EntityDetailsStatus.partialFailure,
diff --git a/lib/entity_details/bloc/entity_details_state.dart b/lib/entity_details/bloc/entity_details_state.dart
index 9fe3ff8..522aafd 100644
--- a/lib/entity_details/bloc/entity_details_state.dart
+++ b/lib/entity_details/bloc/entity_details_state.dart
@@ -63,7 +63,7 @@ class EntityDetailsState extends Equatable {
   final String? headlinesCursor;
 
   /// The exception that occurred, if any.
-  final HtHttpException? exception;
+  final HttpException? exception;
 
   /// Creates a copy of the current state with updated values.
   EntityDetailsState copyWith({
@@ -74,7 +74,7 @@ class EntityDetailsState extends Equatable {
     List<FeedItem>? feedItems,
     bool? hasMoreHeadlines,
     String? headlinesCursor,
-    HtHttpException? exception,
+    HttpException? exception,
     bool clearEntity = false,
     bool clearHeadlinesCursor = false,
     bool clearException = false,
diff --git a/lib/entity_details/view/entity_details_page.dart b/lib/entity_details/view/entity_details_page.dart
index a761749..1c73597 100644
--- a/lib/entity_details/view/entity_details_page.dart
+++ b/lib/entity_details/view/entity_details_page.dart
@@ -1,18 +1,18 @@
 // ignore_for_file: no_default_cases
 
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/bloc/entity_details_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/entity_details/bloc/entity_details_bloc.dart';
-import 'package:ht_main/l10n/app_localizations.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/shared/shared.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 class EntityDetailsPageArguments {
   const EntityDetailsPageArguments({
@@ -48,9 +48,9 @@ class EntityDetailsPage extends StatelessWidget {
         final feedInjectorService = FeedInjectorService();
         final entityDetailsBloc =
             EntityDetailsBloc(
-              headlinesRepository: context.read<HtDataRepository<Headline>>(),
-              topicRepository: context.read<HtDataRepository<Topic>>(),
-              sourceRepository: context.read<HtDataRepository<Source>>(),
+              headlinesRepository: context.read<DataRepository<Headline>>(),
+              topicRepository: context.read<DataRepository<Topic>>(),
+              sourceRepository: context.read<DataRepository<Source>>(),
               accountBloc: context.read<AccountBloc>(),
               appBloc: context.read<AppBloc>(),
               feedInjectorService: feedInjectorService,
diff --git a/lib/headline-details/bloc/headline_details_bloc.dart b/lib/headline-details/bloc/headline_details_bloc.dart
index 45c9925..62048f3 100644
--- a/lib/headline-details/bloc/headline_details_bloc.dart
+++ b/lib/headline-details/bloc/headline_details_bloc.dart
@@ -1,24 +1,23 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart' show Headline, HttpException, UnknownException;
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart'
-    show Headline, HtHttpException, UnknownException;
 
 part 'headline_details_event.dart';
 part 'headline_details_state.dart';
 
 class HeadlineDetailsBloc
     extends Bloc<HeadlineDetailsEvent, HeadlineDetailsState> {
-  HeadlineDetailsBloc({required HtDataRepository<Headline> headlinesRepository})
+  HeadlineDetailsBloc({required DataRepository<Headline> headlinesRepository})
     : _headlinesRepository = headlinesRepository,
       super(HeadlineDetailsInitial()) {
     on<FetchHeadlineById>(_onFetchHeadlineById);
     on<HeadlineProvided>(_onHeadlineProvided);
   }
 
-  final HtDataRepository<Headline> _headlinesRepository;
+  final DataRepository<Headline> _headlinesRepository;
 
   Future<void> _onFetchHeadlineById(
     FetchHeadlineById event,
@@ -28,7 +27,7 @@ class HeadlineDetailsBloc
     try {
       final headline = await _headlinesRepository.read(id: event.headlineId);
       emit(HeadlineDetailsLoaded(headline: headline));
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(HeadlineDetailsFailure(exception: e));
     } catch (e) {
       emit(
diff --git a/lib/headline-details/bloc/headline_details_state.dart b/lib/headline-details/bloc/headline_details_state.dart
index 42ae4f0..ff7b928 100644
--- a/lib/headline-details/bloc/headline_details_state.dart
+++ b/lib/headline-details/bloc/headline_details_state.dart
@@ -23,7 +23,7 @@ class HeadlineDetailsLoaded extends HeadlineDetailsState {
 class HeadlineDetailsFailure extends HeadlineDetailsState {
   const HeadlineDetailsFailure({required this.exception});
 
-  final HtHttpException exception;
+  final HttpException exception;
 
   @override
   List<Object> get props => [exception];
diff --git a/lib/headline-details/bloc/similar_headlines_bloc.dart b/lib/headline-details/bloc/similar_headlines_bloc.dart
index 2325b59..bd785f7 100644
--- a/lib/headline-details/bloc/similar_headlines_bloc.dart
+++ b/lib/headline-details/bloc/similar_headlines_bloc.dart
@@ -1,24 +1,22 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart' show Headline, HttpException, PaginationOptions;
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart'
-    show Headline, HtHttpException, PaginationOptions;
 
 part 'similar_headlines_event.dart';
 part 'similar_headlines_state.dart';
 
 class SimilarHeadlinesBloc
     extends Bloc<SimilarHeadlinesEvent, SimilarHeadlinesState> {
-  SimilarHeadlinesBloc({
-    required HtDataRepository<Headline> headlinesRepository,
-  }) : _headlinesRepository = headlinesRepository,
-       super(SimilarHeadlinesInitial()) {
+  SimilarHeadlinesBloc({required DataRepository<Headline> headlinesRepository})
+    : _headlinesRepository = headlinesRepository,
+      super(SimilarHeadlinesInitial()) {
     on<FetchSimilarHeadlines>(_onFetchSimilarHeadlines);
   }
 
-  final HtDataRepository<Headline> _headlinesRepository;
+  final DataRepository<Headline> _headlinesRepository;
   static const int _similarHeadlinesLimit = 5;
 
   Future<void> _onFetchSimilarHeadlines(
@@ -55,7 +53,7 @@ class SimilarHeadlinesBloc
       } else {
         emit(SimilarHeadlinesLoaded(similarHeadlines: finalSimilarHeadlines));
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(SimilarHeadlinesError(message: e.message));
     } catch (e) {
       emit(SimilarHeadlinesError(message: 'An unexpected error occurred: $e'));
diff --git a/lib/headline-details/view/headline_details_page.dart b/lib/headline-details/view/headline_details_page.dart
index 5d298c0..42669ed 100644
--- a/lib/headline-details/view/headline_details_page.dart
+++ b/lib/headline-details/view/headline_details_page.dart
@@ -1,22 +1,22 @@
 //
 // ignore_for_file: avoid_redundant_argument_values
 
+import 'package:core/core.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/headline_details_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/similar_headlines_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/headline-details/bloc/headline_details_bloc.dart';
-import 'package:ht_main/headline-details/bloc/similar_headlines_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/shared/shared.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
 import 'package:intl/intl.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:ui_kit/ui_kit.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class HeadlineDetailsPage extends StatefulWidget {
@@ -402,39 +402,15 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
     final chips = <Widget>[];
 
     final formattedDate = DateFormat('MMM d, yyyy').format(headline.createdAt);
-    chips.add(
-      Chip(
-        avatar: Icon(
-          Icons.calendar_today_outlined,
-          size: chipAvatarSize,
-          color: chipAvatarColor,
-        ),
-        label: Text(formattedDate),
-        labelStyle: chipLabelStyle,
-        backgroundColor: chipBackgroundColor,
-        padding: chipPadding,
-        shape: chipShape,
-        visualDensity: VisualDensity.compact,
-        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-      ),
-    );
-
-    chips.add(
-      InkWell(
-        onTap: () {
-          context.push(
-            Routes.sourceDetails,
-            extra: EntityDetailsPageArguments(entity: headline.source),
-          );
-        },
-        borderRadius: BorderRadius.circular(AppSpacing.sm),
-        child: Chip(
+    chips
+      ..add(
+        Chip(
           avatar: Icon(
-            Icons.source_outlined,
+            Icons.calendar_today_outlined,
             size: chipAvatarSize,
             color: chipAvatarColor,
           ),
-          label: Text(headline.source.name),
+          label: Text(formattedDate),
           labelStyle: chipLabelStyle,
           backgroundColor: chipBackgroundColor,
           padding: chipPadding,
@@ -442,34 +418,57 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
           visualDensity: VisualDensity.compact,
           materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         ),
-      ),
-    );
-
-    chips.add(
-      InkWell(
-        onTap: () {
-          context.push(
-            Routes.topicDetails,
-            extra: EntityDetailsPageArguments(entity: headline.topic),
-          );
-        },
-        borderRadius: BorderRadius.circular(AppSpacing.sm),
-        child: Chip(
-          avatar: Icon(
-            Icons.category_outlined,
-            size: chipAvatarSize,
-            color: chipAvatarColor,
+      )
+      ..add(
+        InkWell(
+          onTap: () {
+            context.push(
+              Routes.sourceDetails,
+              extra: EntityDetailsPageArguments(entity: headline.source),
+            );
+          },
+          borderRadius: BorderRadius.circular(AppSpacing.sm),
+          child: Chip(
+            avatar: Icon(
+              Icons.source_outlined,
+              size: chipAvatarSize,
+              color: chipAvatarColor,
+            ),
+            label: Text(headline.source.name),
+            labelStyle: chipLabelStyle,
+            backgroundColor: chipBackgroundColor,
+            padding: chipPadding,
+            shape: chipShape,
+            visualDensity: VisualDensity.compact,
+            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
           ),
-          label: Text(headline.topic.name),
-          labelStyle: chipLabelStyle,
-          backgroundColor: chipBackgroundColor,
-          padding: chipPadding,
-          shape: chipShape,
-          visualDensity: VisualDensity.compact,
-          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         ),
-      ),
-    );
+      )
+      ..add(
+        InkWell(
+          onTap: () {
+            context.push(
+              Routes.topicDetails,
+              extra: EntityDetailsPageArguments(entity: headline.topic),
+            );
+          },
+          borderRadius: BorderRadius.circular(AppSpacing.sm),
+          child: Chip(
+            avatar: Icon(
+              Icons.category_outlined,
+              size: chipAvatarSize,
+              color: chipAvatarColor,
+            ),
+            label: Text(headline.topic.name),
+            labelStyle: chipLabelStyle,
+            backgroundColor: chipBackgroundColor,
+            padding: chipPadding,
+            shape: chipShape,
+            visualDensity: VisualDensity.compact,
+            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+          ),
+        ),
+      );
 
     return chips;
   }
diff --git a/lib/headlines-feed/bloc/countries_filter_bloc.dart b/lib/headlines-feed/bloc/countries_filter_bloc.dart
index 86418e0..0e2a101 100644
--- a/lib/headlines-feed/bloc/countries_filter_bloc.dart
+++ b/lib/headlines-feed/bloc/countries_filter_bloc.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 part 'countries_filter_event.dart';
 part 'countries_filter_state.dart';
@@ -13,14 +13,14 @@ part 'countries_filter_state.dart';
 /// Manages the state for fetching and displaying countries for filtering.
 ///
 /// Handles initial fetching and pagination of countries using the
-/// provided [HtDataRepository].
+/// provided [DataRepository].
 /// {@endtemplate}
 class CountriesFilterBloc
     extends Bloc<CountriesFilterEvent, CountriesFilterState> {
   /// {@macro countries_filter_bloc}
   ///
-  /// Requires a [HtDataRepository<Country>] to interact with the data layer.
-  CountriesFilterBloc({required HtDataRepository<Country> countriesRepository})
+  /// Requires a [DataRepository<Country>] to interact with the data layer.
+  CountriesFilterBloc({required DataRepository<Country> countriesRepository})
     : _countriesRepository = countriesRepository,
       super(const CountriesFilterState()) {
     on<CountriesFilterRequested>(
@@ -33,7 +33,7 @@ class CountriesFilterBloc
     );
   }
 
-  final HtDataRepository<Country> _countriesRepository;
+  final DataRepository<Country> _countriesRepository;
 
   /// Number of countries to fetch per page.
   static const _countriesLimit = 20;
@@ -63,7 +63,7 @@ class CountriesFilterBloc
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: CountriesFilterStatus.failure, error: e));
     }
   }
@@ -94,7 +94,7 @@ class CountriesFilterBloc
           cursor: response.cursor,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: CountriesFilterStatus.failure, error: e));
     }
   }
diff --git a/lib/headlines-feed/bloc/countries_filter_state.dart b/lib/headlines-feed/bloc/countries_filter_state.dart
index a274db1..1e67d0c 100644
--- a/lib/headlines-feed/bloc/countries_filter_state.dart
+++ b/lib/headlines-feed/bloc/countries_filter_state.dart
@@ -50,7 +50,7 @@ final class CountriesFilterState extends Equatable {
   final String? cursor;
 
   /// An optional error object if the status is [CountriesFilterStatus.failure].
-  final HtHttpException? error;
+  final HttpException? error;
 
   /// Creates a copy of this state with the given fields replaced.
   CountriesFilterState copyWith({
@@ -58,7 +58,7 @@ final class CountriesFilterState extends Equatable {
     List<Country>? countries,
     bool? hasMore,
     String? cursor,
-    HtHttpException? error,
+    HttpException? error,
     bool clearError = false,
     bool clearCursor = false,
   }) {
diff --git a/lib/headlines-feed/bloc/headlines_feed_bloc.dart b/lib/headlines-feed/bloc/headlines_feed_bloc.dart
index fa57264..900e2bf 100644
--- a/lib/headlines-feed/bloc/headlines_feed_bloc.dart
+++ b/lib/headlines-feed/bloc/headlines_feed_bloc.dart
@@ -2,12 +2,12 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/headlines-feed/models/headline_filter.dart';
-import 'package:ht_main/shared/services/feed_injector_service.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/models/headline_filter.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/services/feed_injector_service.dart';
 
 part 'headlines_feed_event.dart';
 part 'headlines_feed_state.dart';
@@ -16,7 +16,7 @@ part 'headlines_feed_state.dart';
 /// Manages the state for the headlines feed feature.
 ///
 /// Handles fetching headlines, applying filters, pagination, and refreshing
-/// the feed using the provided [HtDataRepository]. It uses [FeedInjectorService]
+/// the feed using the provided [DataRepository]. It uses [FeedInjectorService]
 /// to inject ads and account actions into the feed.
 /// {@endtemplate}
 class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
@@ -24,7 +24,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
   ///
   /// Requires repositories and services for its operations.
   HeadlinesFeedBloc({
-    required HtDataRepository<Headline> headlinesRepository,
+    required DataRepository<Headline> headlinesRepository,
     required FeedInjectorService feedInjectorService,
     required AppBloc appBloc,
   }) : _headlinesRepository = headlinesRepository,
@@ -49,7 +49,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
     );
   }
 
-  final HtDataRepository<Headline> _headlinesRepository;
+  final DataRepository<Headline> _headlinesRepository;
   final FeedInjectorService _feedInjectorService;
   final AppBloc _appBloc;
 
@@ -125,7 +125,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: HeadlinesFeedStatus.failure, error: e));
     }
   }
@@ -179,7 +179,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: HeadlinesFeedStatus.failure, error: e));
     }
   }
@@ -240,7 +240,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: HeadlinesFeedStatus.failure, error: e));
     }
   }
@@ -289,10 +289,10 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
 
       if (processedFeedItems.any((item) => item is FeedAction) &&
           currentUser?.id != null) {
-        // TODO(ht-development): Implement correct event dispatching
+        // TODO(fulleni): Implement correct event dispatching
         // _appBloc.add(AppUserFeedActionShown(userId: currentUser!.id));
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: HeadlinesFeedStatus.failure, error: e));
     }
   }
diff --git a/lib/headlines-feed/bloc/headlines_feed_state.dart b/lib/headlines-feed/bloc/headlines_feed_state.dart
index 1556f78..167a808 100644
--- a/lib/headlines-feed/bloc/headlines_feed_state.dart
+++ b/lib/headlines-feed/bloc/headlines_feed_state.dart
@@ -17,7 +17,7 @@ class HeadlinesFeedState extends Equatable {
   final bool hasMore;
   final String? cursor;
   final HeadlineFilter filter;
-  final HtHttpException? error;
+  final HttpException? error;
 
   HeadlinesFeedState copyWith({
     HeadlinesFeedStatus? status,
@@ -25,7 +25,7 @@ class HeadlinesFeedState extends Equatable {
     bool? hasMore,
     String? cursor,
     HeadlineFilter? filter,
-    HtHttpException? error,
+    HttpException? error,
     bool clearCursor = false,
   }) {
     return HeadlinesFeedState(
diff --git a/lib/headlines-feed/bloc/sources_filter_bloc.dart b/lib/headlines-feed/bloc/sources_filter_bloc.dart
index 97a4234..b192009 100644
--- a/lib/headlines-feed/bloc/sources_filter_bloc.dart
+++ b/lib/headlines-feed/bloc/sources_filter_bloc.dart
@@ -1,17 +1,17 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 part 'sources_filter_event.dart';
 part 'sources_filter_state.dart';
 
 class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
   SourcesFilterBloc({
-    required HtDataRepository<Source> sourcesRepository,
-    required HtDataRepository<Country> countriesRepository,
+    required DataRepository<Source> sourcesRepository,
+    required DataRepository<Country> countriesRepository,
   }) : _sourcesRepository = sourcesRepository,
        _countriesRepository = countriesRepository,
        super(const SourcesFilterState()) {
@@ -24,8 +24,8 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
     // Removed _FetchFilteredSourcesRequested event listener
   }
 
-  final HtDataRepository<Source> _sourcesRepository;
-  final HtDataRepository<Country> _countriesRepository;
+  final DataRepository<Source> _sourcesRepository;
+  final DataRepository<Country> _countriesRepository;
 
   Future<void> _onLoadSourceFilterData(
     LoadSourceFilterData event,
@@ -68,7 +68,7 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
           clearErrorMessage: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(
         state.copyWith(
           dataLoadingStatus: SourceFilterDataLoadingStatus.failure,
diff --git a/lib/headlines-feed/bloc/sources_filter_state.dart b/lib/headlines-feed/bloc/sources_filter_state.dart
index 2dd05ed..ce30d9d 100644
--- a/lib/headlines-feed/bloc/sources_filter_state.dart
+++ b/lib/headlines-feed/bloc/sources_filter_state.dart
@@ -25,7 +25,7 @@ class SourcesFilterState extends Equatable {
   final List<Source> displayableSources;
   final Set<String> finallySelectedSourceIds;
   final SourceFilterDataLoadingStatus dataLoadingStatus;
-  final HtHttpException? error;
+  final HttpException? error;
 
   SourcesFilterState copyWith({
     List<Country>? availableCountries,
@@ -36,7 +36,7 @@ class SourcesFilterState extends Equatable {
     List<Source>? displayableSources,
     Set<String>? finallySelectedSourceIds,
     SourceFilterDataLoadingStatus? dataLoadingStatus,
-    HtHttpException? error,
+    HttpException? error,
     bool clearErrorMessage = false,
   }) {
     return SourcesFilterState(
diff --git a/lib/headlines-feed/bloc/topics_filter_bloc.dart b/lib/headlines-feed/bloc/topics_filter_bloc.dart
index e7784bb..9f3fbd3 100644
--- a/lib/headlines-feed/bloc/topics_filter_bloc.dart
+++ b/lib/headlines-feed/bloc/topics_filter_bloc.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 part 'topics_filter_event.dart';
 part 'topics_filter_state.dart';
@@ -13,13 +13,13 @@ part 'topics_filter_state.dart';
 /// Manages the state for fetching and displaying topics for filtering.
 ///
 /// Handles initial fetching and pagination of topics using the
-/// provided [HtDataRepository].
+/// provided [DataRepository].
 /// {@endtemplate}
 class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
   /// {@macro topics_filter_bloc}
   ///
-  /// Requires a [HtDataRepository<Topic>] to interact with the data layer.
-  TopicsFilterBloc({required HtDataRepository<Topic> topicsRepository})
+  /// Requires a [DataRepository<Topic>] to interact with the data layer.
+  TopicsFilterBloc({required DataRepository<Topic> topicsRepository})
     : _topicsRepository = topicsRepository,
       super(const TopicsFilterState()) {
     on<TopicsFilterRequested>(
@@ -32,7 +32,7 @@ class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
     );
   }
 
-  final HtDataRepository<Topic> _topicsRepository;
+  final DataRepository<Topic> _topicsRepository;
 
   /// Number of topics to fetch per page.
   static const _topicsLimit = 20;
@@ -64,7 +64,7 @@ class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
           clearError: true,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: TopicsFilterStatus.failure, error: e));
     }
   }
@@ -97,7 +97,7 @@ class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
           cursor: response.cursor,
         ),
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       // Keep existing data but indicate failure
       emit(state.copyWith(status: TopicsFilterStatus.failure, error: e));
     }
diff --git a/lib/headlines-feed/bloc/topics_filter_state.dart b/lib/headlines-feed/bloc/topics_filter_state.dart
index b8a1a41..a0cbab9 100644
--- a/lib/headlines-feed/bloc/topics_filter_state.dart
+++ b/lib/headlines-feed/bloc/topics_filter_state.dart
@@ -48,7 +48,7 @@ final class TopicsFilterState extends Equatable {
   final String? cursor;
 
   /// An optional error object if the status is [TopicsFilterStatus.failure].
-  final HtHttpException? error;
+  final HttpException? error;
 
   /// Creates a copy of this state with the given fields replaced.
   TopicsFilterState copyWith({
@@ -56,7 +56,7 @@ final class TopicsFilterState extends Equatable {
     List<Topic>? topics,
     bool? hasMore,
     String? cursor,
-    HtHttpException? error,
+    HttpException? error,
     bool clearError = false,
     bool clearCursor = false,
   }) {
diff --git a/lib/headlines-feed/models/headline_filter.dart b/lib/headlines-feed/models/headline_filter.dart
index 908dd14..e5ef94b 100644
--- a/lib/headlines-feed/models/headline_filter.dart
+++ b/lib/headlines-feed/models/headline_filter.dart
@@ -1,5 +1,5 @@
+import 'package:core/core.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 /// {@template headline_filter}
 /// A model representing the filter parameters for headlines.
diff --git a/lib/headlines-feed/view/country_filter_page.dart b/lib/headlines-feed/view/country_filter_page.dart
index 55a4786..68c6194 100644
--- a/lib/headlines-feed/view/country_filter_page.dart
+++ b/lib/headlines-feed/view/country_filter_page.dart
@@ -1,13 +1,13 @@
 //
 // ignore_for_file: lines_longer_than_80_chars
 
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/countries_filter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/headlines-feed/bloc/countries_filter_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template country_filter_page}
 /// A page dedicated to selecting event countries for filtering headlines.
diff --git a/lib/headlines-feed/view/headlines_feed_page.dart b/lib/headlines-feed/view/headlines_feed_page.dart
index c8ed0e9..070ab1b 100644
--- a/lib/headlines-feed/view/headlines_feed_page.dart
+++ b/lib/headlines-feed/view/headlines_feed_page.dart
@@ -1,16 +1,16 @@
 //
 // ignore_for_file: lines_longer_than_80_chars
 
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/headlines_feed_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/shared/shared.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template headlines_feed_view}
 /// The core view widget for the headlines feed.
@@ -282,7 +282,7 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
                           if (item.targetUrl.isNotEmpty)
                             TextButton(
                               onPressed: () {
-                                // TODO(ht-development): Launch URL
+                                // TODO(fulleni): Launch URL
                               },
                               child: const Text('Visit Advertiser'),
                             ),
diff --git a/lib/headlines-feed/view/headlines_filter_page.dart b/lib/headlines-feed/view/headlines_filter_page.dart
index 158843d..871ef6f 100644
--- a/lib/headlines-feed/view/headlines_filter_page.dart
+++ b/lib/headlines-feed/view/headlines_filter_page.dart
@@ -1,17 +1,17 @@
 //
 // ignore_for_file: lines_longer_than_80_chars, public_member_api_docs, unused_field
 
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/headlines_feed_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/models/headline_filter.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
-import 'package:ht_main/headlines-feed/models/headline_filter.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 // Keys for passing data to/from SourceFilterPage
 const String keySelectedSources = 'selectedSources';
@@ -107,7 +107,7 @@ class _HeadlinesFilterPageState extends State<HeadlinesFilterPage> {
 
     try {
       final preferencesRepo = context
-          .read<HtDataRepository<UserContentPreferences>>();
+          .read<DataRepository<UserContentPreferences>>();
       final preferences = await preferencesRepo.read(
         id: currentUser.id,
         userId: currentUser.id,
@@ -175,7 +175,7 @@ class _HeadlinesFilterPageState extends State<HeadlinesFilterPage> {
             ),
           );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       setState(() {
         _isLoadingFollowedFilters = false;
         _useFollowedFilters = false;
diff --git a/lib/headlines-feed/view/source_filter_page.dart b/lib/headlines-feed/view/source_filter_page.dart
index 7e41a05..783c3cb 100644
--- a/lib/headlines-feed/view/source_filter_page.dart
+++ b/lib/headlines-feed/view/source_filter_page.dart
@@ -1,15 +1,15 @@
 // ignore_for_file: lines_longer_than_80_chars
 
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/headlines-feed/bloc/sources_filter_bloc.dart';
-import 'package:ht_main/headlines-feed/view/headlines_filter_page.dart'
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/sources_filter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/headlines_filter_page.dart'
     show keySelectedCountryIsoCodes, keySelectedSourceTypes, keySelectedSources;
-import 'package:ht_main/l10n/app_localizations.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 // Keys are defined in headlines_filter_page.dart and imported by router.dart
 // const String keySelectedSources = 'selectedSources';
@@ -33,8 +33,8 @@ class SourceFilterPage extends StatelessWidget {
     return BlocProvider(
       create: (context) =>
           SourcesFilterBloc(
-            sourcesRepository: context.read<HtDataRepository<Source>>(),
-            countriesRepository: context.read<HtDataRepository<Country>>(),
+            sourcesRepository: context.read<DataRepository<Source>>(),
+            countriesRepository: context.read<DataRepository<Country>>(),
           )..add(
             LoadSourceFilterData(
               initialSelectedSources: initialSelectedSources,
diff --git a/lib/headlines-feed/view/topic_filter_page.dart b/lib/headlines-feed/view/topic_filter_page.dart
index 5a44013..b1c7eb8 100644
--- a/lib/headlines-feed/view/topic_filter_page.dart
+++ b/lib/headlines-feed/view/topic_filter_page.dart
@@ -1,10 +1,10 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/topics_filter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/headlines-feed/bloc/topics_filter_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 class TopicFilterPage extends StatefulWidget {
   const TopicFilterPage({super.key});
diff --git a/lib/headlines-search/bloc/headlines_search_bloc.dart b/lib/headlines-search/bloc/headlines_search_bloc.dart
index 45b0f36..bc68748 100644
--- a/lib/headlines-search/bloc/headlines_search_bloc.dart
+++ b/lib/headlines-search/bloc/headlines_search_bloc.dart
@@ -2,11 +2,11 @@
 
 import 'package:bloc/bloc.dart';
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/shared/services/feed_injector_service.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/services/feed_injector_service.dart';
 
 part 'headlines_search_event.dart';
 part 'headlines_search_state.dart';
@@ -14,9 +14,9 @@ part 'headlines_search_state.dart';
 class HeadlinesSearchBloc
     extends Bloc<HeadlinesSearchEvent, HeadlinesSearchState> {
   HeadlinesSearchBloc({
-    required HtDataRepository<Headline> headlinesRepository,
-    required HtDataRepository<Topic> topicRepository,
-    required HtDataRepository<Source> sourceRepository,
+    required DataRepository<Headline> headlinesRepository,
+    required DataRepository<Topic> topicRepository,
+    required DataRepository<Source> sourceRepository,
     required AppBloc appBloc,
     required FeedInjectorService feedInjectorService,
   }) : _headlinesRepository = headlinesRepository,
@@ -32,9 +32,9 @@ class HeadlinesSearchBloc
     );
   }
 
-  final HtDataRepository<Headline> _headlinesRepository;
-  final HtDataRepository<Topic> _topicRepository;
-  final HtDataRepository<Source> _sourceRepository;
+  final DataRepository<Headline> _headlinesRepository;
+  final DataRepository<Topic> _topicRepository;
+  final DataRepository<Source> _sourceRepository;
   final AppBloc _appBloc;
   final FeedInjectorService _feedInjectorService;
   static const _limit = 10;
@@ -174,7 +174,7 @@ class HeadlinesSearchBloc
                 hasMore: false,
               );
           }
-        } on HtHttpException catch (e) {
+        } on HttpException catch (e) {
           emit(successState.copyWith(errorMessage: e.message));
         } catch (e, st) {
           print('Search pagination error ($modelType): $e\n$st');
@@ -267,7 +267,7 @@ class HeadlinesSearchBloc
           ),
         );
       }
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(
         HeadlinesSearchFailure(
           errorMessage: e.message,
diff --git a/lib/headlines-search/view/headlines_search_page.dart b/lib/headlines-search/view/headlines_search_page.dart
index 1e3cc12..5e91e69 100644
--- a/lib/headlines-search/view/headlines_search_page.dart
+++ b/lib/headlines-search/view/headlines_search_page.dart
@@ -1,21 +1,21 @@
 //
 // ignore_for_file: lines_longer_than_80_chars
 
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 // HeadlineItemWidget import removed
-import 'package:ht_main/headlines-search/bloc/headlines_search_bloc.dart';
-// import 'package:ht_main/headlines-search/widgets/country_item_widget.dart';
-import 'package:ht_main/headlines-search/widgets/source_item_widget.dart';
-import 'package:ht_main/headlines-search/widgets/topic_item_widget.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/shared/extensions/content_type_extensions.dart';
-import 'package:ht_main/shared/shared.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/bloc/headlines_search_bloc.dart';
+// import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/widgets/country_item_widget.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/widgets/source_item_widget.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/widgets/topic_item_widget.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/extensions/content_type_extensions.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// Page widget responsible for providing the BLoC for the headlines search feature.
 class HeadlinesSearchPage extends StatelessWidget {
@@ -56,7 +56,7 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
         _showClearButton = _textController.text.isNotEmpty;
       });
     });
-    // TODO(user): This logic might need adjustment if not all ContentType values are searchable.
+    // TODO(fulleni): This logic might need adjustment if not all ContentType values are searchable.
     // For now, we default to headline if the current selection is not in the allowed list.
     final searchableTypes = [
       ContentType.headline,
@@ -110,7 +110,7 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
     final textTheme = theme.textTheme;
     final appBarTheme = theme.appBarTheme;
 
-    // TODO(user): Replace this with a filtered list of searchable content types.
+    // TODO(fulleni): Replace this with a filtered list of searchable content types.
     final availableSearchModelTypes = [
       ContentType.headline,
       ContentType.topic,
@@ -159,7 +159,7 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
                       appBarTheme.iconTheme?.color ??
                       colorScheme.onSurfaceVariant,
                 ),
-                // TODO(user): Use the new localization extension here.
+                // TODO(fulleni): Use the new localization extension here.
                 items: availableSearchModelTypes.map((ContentType type) {
                   return DropdownMenuItem<ContentType>(
                     value: type,
@@ -187,7 +187,7 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
                 controller: _textController,
                 style: appBarTheme.titleTextStyle ?? textTheme.titleMedium,
                 decoration: InputDecoration(
-                  // TODO(user): Create a similar localization extension for hint text.
+                  // TODO(fulleni): Create a similar localization extension for hint text.
                   hintText: 'Search...',
                   hintStyle: textTheme.bodyMedium?.copyWith(
                     color:
diff --git a/lib/headlines-search/widgets/category_item_widget.dart b/lib/headlines-search/widgets/category_item_widget.dart
index 4376985..2d74092 100644
--- a/lib/headlines-search/widgets/category_item_widget.dart
+++ b/lib/headlines-search/widgets/category_item_widget.dart
@@ -1,8 +1,8 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 /// A simple widget to display a Topic search result.
 class TopicItemWidget extends StatelessWidget {
diff --git a/lib/headlines-search/widgets/source_item_widget.dart b/lib/headlines-search/widgets/source_item_widget.dart
index 37a34cc..7128df9 100644
--- a/lib/headlines-search/widgets/source_item_widget.dart
+++ b/lib/headlines-search/widgets/source_item_widget.dart
@@ -1,8 +1,8 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 /// A simple widget to display a Source search result.
 class SourceItemWidget extends StatelessWidget {
diff --git a/lib/headlines-search/widgets/topic_item_widget.dart b/lib/headlines-search/widgets/topic_item_widget.dart
index 4376985..2d74092 100644
--- a/lib/headlines-search/widgets/topic_item_widget.dart
+++ b/lib/headlines-search/widgets/topic_item_widget.dart
@@ -1,8 +1,8 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 /// A simple widget to display a Topic search result.
 class TopicItemWidget extends StatelessWidget {
diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
index 9c3128d..36df595 100644
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:ht_main/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
 
 extension AppLocalizationsX on BuildContext {
   AppLocalizations get l10n => AppLocalizations.of(this);
diff --git a/lib/main.dart b/lib/main.dart
index 964b777..0a7b906 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,8 +3,8 @@ import 'dart:js_interop';
 import 'package:device_preview/device_preview.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:ht_main/app/config/config.dart';
-import 'package:ht_main/bootstrap.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/bootstrap.dart';
 
 // Define the current application environment (production/development/demo).
 const appEnvironment = AppEnvironment.demo;
diff --git a/lib/router/router.dart b/lib/router/router.dart
index 45a5b6c..b4ca951 100644
--- a/lib/router/router.dart
+++ b/lib/router/router.dart
@@ -1,50 +1,51 @@
+import 'package:auth_repository/auth_repository.dart';
+import 'package:core/core.dart' hide AppStatus;
+import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/account_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/manage_followed_items_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/sources/add_source_to_follow_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/sources/followed_sources_list_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/topics/followed_topics_list_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/account/view/saved_headlines_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
+    as local_config;
+import 'package:flutter_news_app_mobile_client_full_source_code/app/view/app_shell.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/authentication_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/email_code_verification_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/request_code_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/headline_details_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/similar_headlines_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/view/headline_details_page.dart';
+// import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/countries_filter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/headlines_feed_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/sources_filter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/topics_filter_bloc.dart';
+// import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/country_filter_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/headlines_feed_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/headlines_filter_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/source_filter_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/topic_filter_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/bloc/headlines_search_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/view/headlines_search_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/appearance_settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/feed_settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/font_settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/language_settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/notification_settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/theme_settings_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/services/feed_injector_service.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_auth_repository/ht_auth_repository.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_main/account/bloc/account_bloc.dart';
-import 'package:ht_main/account/view/account_page.dart';
-import 'package:ht_main/account/view/manage_followed_items/manage_followed_items_page.dart';
-import 'package:ht_main/account/view/manage_followed_items/sources/add_source_to_follow_page.dart';
-import 'package:ht_main/account/view/manage_followed_items/sources/followed_sources_list_page.dart';
-import 'package:ht_main/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart';
-import 'package:ht_main/account/view/manage_followed_items/topics/followed_topics_list_page.dart';
-import 'package:ht_main/account/view/saved_headlines_page.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/app/config/config.dart' as local_config;
-import 'package:ht_main/app/view/app_shell.dart';
-import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
-import 'package:ht_main/authentication/view/authentication_page.dart';
-import 'package:ht_main/authentication/view/email_code_verification_page.dart';
-import 'package:ht_main/authentication/view/request_code_page.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/headline-details/bloc/headline_details_bloc.dart';
-import 'package:ht_main/headline-details/bloc/similar_headlines_bloc.dart';
-import 'package:ht_main/headline-details/view/headline_details_page.dart';
-// import 'package:ht_main/headlines-feed/bloc/countries_filter_bloc.dart';
-import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
-import 'package:ht_main/headlines-feed/bloc/sources_filter_bloc.dart';
-import 'package:ht_main/headlines-feed/bloc/topics_filter_bloc.dart';
-// import 'package:ht_main/headlines-feed/view/country_filter_page.dart';
-import 'package:ht_main/headlines-feed/view/headlines_feed_page.dart';
-import 'package:ht_main/headlines-feed/view/headlines_filter_page.dart';
-import 'package:ht_main/headlines-feed/view/source_filter_page.dart';
-import 'package:ht_main/headlines-feed/view/topic_filter_page.dart';
-import 'package:ht_main/headlines-search/bloc/headlines_search_bloc.dart';
-import 'package:ht_main/headlines-search/view/headlines_search_page.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_main/settings/view/appearance_settings_page.dart';
-import 'package:ht_main/settings/view/feed_settings_page.dart';
-import 'package:ht_main/settings/view/font_settings_page.dart';
-import 'package:ht_main/settings/view/language_settings_page.dart';
-import 'package:ht_main/settings/view/notification_settings_page.dart';
-import 'package:ht_main/settings/view/settings_page.dart';
-import 'package:ht_main/settings/view/theme_settings_page.dart';
-import 'package:ht_main/shared/services/feed_injector_service.dart';
-import 'package:ht_shared/ht_shared.dart' hide AppStatus;
 
 /// Creates and configures the GoRouter instance for the application.
 ///
@@ -52,20 +53,20 @@ import 'package:ht_shared/ht_shared.dart' hide AppStatus;
 /// authentication state changes.
 GoRouter createRouter({
   required ValueNotifier<AppStatus> authStatusNotifier,
-  required HtAuthRepository htAuthenticationRepository,
-  required HtDataRepository<Headline> htHeadlinesRepository,
-  required HtDataRepository<Topic> htTopicsRepository,
-  required HtDataRepository<Country> htCountriesRepository,
-  required HtDataRepository<Source> htSourcesRepository,
-  required HtDataRepository<UserAppSettings> htUserAppSettingsRepository,
-  required HtDataRepository<UserContentPreferences>
+  required AuthRepository authenticationRepository,
+  required DataRepository<Headline> htHeadlinesRepository,
+  required DataRepository<Topic> htTopicsRepository,
+  required DataRepository<Country> htCountriesRepository,
+  required DataRepository<Source> htSourcesRepository,
+  required DataRepository<UserAppSettings> htUserAppSettingsRepository,
+  required DataRepository<UserContentPreferences>
   htUserContentPreferencesRepository,
-  required HtDataRepository<RemoteConfig> htRemoteConfigRepository,
+  required DataRepository<RemoteConfig> htRemoteConfigRepository,
   required local_config.AppEnvironment environment,
 }) {
   // Instantiate AccountBloc once to be shared
   final accountBloc = AccountBloc(
-    authenticationRepository: htAuthenticationRepository,
+    authenticationRepository: authenticationRepository,
     userContentPreferencesRepository: htUserContentPreferencesRepository,
     environment: environment,
   );
@@ -226,7 +227,7 @@ GoRouter createRouter({
 
           return BlocProvider(
             create: (context) => AuthenticationBloc(
-              authenticationRepository: context.read<HtAuthRepository>(),
+              authenticationRepository: context.read<AuthRepository>(),
             ),
             child: AuthenticationPage(
               headline: headline,
@@ -355,14 +356,12 @@ GoRouter createRouter({
               BlocProvider.value(value: accountBloc),
               BlocProvider(
                 create: (context) => HeadlineDetailsBloc(
-                  headlinesRepository: context
-                      .read<HtDataRepository<Headline>>(),
+                  headlinesRepository: context.read<DataRepository<Headline>>(),
                 ),
               ),
               BlocProvider(
                 create: (context) => SimilarHeadlinesBloc(
-                  headlinesRepository: context
-                      .read<HtDataRepository<Headline>>(),
+                  headlinesRepository: context.read<DataRepository<Headline>>(),
                 ),
               ),
             ],
@@ -386,7 +385,7 @@ GoRouter createRouter({
                   final feedInjectorService = FeedInjectorService();
                   return HeadlinesFeedBloc(
                     headlinesRepository: context
-                        .read<HtDataRepository<Headline>>(),
+                        .read<DataRepository<Headline>>(),
                     feedInjectorService: feedInjectorService,
                     appBloc: context.read<AppBloc>(),
                   )..add(const HeadlinesFeedFetchRequested());
@@ -397,9 +396,9 @@ GoRouter createRouter({
                   final feedInjectorService = FeedInjectorService();
                   return HeadlinesSearchBloc(
                     headlinesRepository: context
-                        .read<HtDataRepository<Headline>>(),
-                    topicRepository: context.read<HtDataRepository<Topic>>(),
-                    sourceRepository: context.read<HtDataRepository<Source>>(),
+                        .read<DataRepository<Headline>>(),
+                    topicRepository: context.read<DataRepository<Topic>>(),
+                    sourceRepository: context.read<DataRepository<Source>>(),
                     appBloc: context.read<AppBloc>(),
                     feedInjectorService: feedInjectorService,
                   );
@@ -433,13 +432,13 @@ GoRouter createRouter({
                           BlocProvider(
                             create: (context) => HeadlineDetailsBloc(
                               headlinesRepository: context
-                                  .read<HtDataRepository<Headline>>(),
+                                  .read<DataRepository<Headline>>(),
                             ),
                           ),
                           BlocProvider(
                             create: (context) => SimilarHeadlinesBloc(
                               headlinesRepository: context
-                                  .read<HtDataRepository<Headline>>(),
+                                  .read<DataRepository<Headline>>(),
                             ),
                           ),
                         ],
@@ -486,7 +485,7 @@ GoRouter createRouter({
                         builder: (context, state) => BlocProvider(
                           create: (context) => TopicsFilterBloc(
                             topicsRepository: context
-                                .read<HtDataRepository<Topic>>(),
+                                .read<DataRepository<Topic>>(),
                           ),
                           child: const TopicFilterPage(),
                         ),
@@ -499,10 +498,10 @@ GoRouter createRouter({
                         builder: (context, state) => BlocProvider(
                           create: (context) => SourcesFilterBloc(
                             sourcesRepository: context
-                                .read<HtDataRepository<Source>>(),
+                                .read<DataRepository<Source>>(),
                             countriesRepository: // Added missing repository
                             context
-                                .read<HtDataRepository<Country>>(),
+                                .read<DataRepository<Country>>(),
                           ),
                           // Pass initialSelectedSources, country ISO codes, and source types from state.extra
                           child: Builder(
@@ -561,13 +560,13 @@ GoRouter createRouter({
                           BlocProvider(
                             create: (context) => HeadlineDetailsBloc(
                               headlinesRepository: context
-                                  .read<HtDataRepository<Headline>>(),
+                                  .read<DataRepository<Headline>>(),
                             ),
                           ),
                           BlocProvider(
                             create: (context) => SimilarHeadlinesBloc(
                               headlinesRepository: context
-                                  .read<HtDataRepository<Headline>>(),
+                                  .read<DataRepository<Headline>>(),
                             ),
                           ),
                         ],
@@ -603,7 +602,7 @@ GoRouter createRouter({
                         create: (context) {
                           final settingsBloc = SettingsBloc(
                             userAppSettingsRepository: context
-                                .read<HtDataRepository<UserAppSettings>>(),
+                                .read<DataRepository<UserAppSettings>>(),
                           );
                           // Only load settings if a userId is available
                           if (userId != null) {
@@ -729,13 +728,13 @@ GoRouter createRouter({
                               BlocProvider(
                                 create: (context) => HeadlineDetailsBloc(
                                   headlinesRepository: context
-                                      .read<HtDataRepository<Headline>>(),
+                                      .read<DataRepository<Headline>>(),
                                 ),
                               ),
                               BlocProvider(
                                 create: (context) => SimilarHeadlinesBloc(
                                   headlinesRepository: context
-                                      .read<HtDataRepository<Headline>>(),
+                                      .read<DataRepository<Headline>>(),
                                 ),
                               ),
                             ],
diff --git a/lib/settings/bloc/settings_bloc.dart b/lib/settings/bloc/settings_bloc.dart
index 5d295e9..59e78fa 100644
--- a/lib/settings/bloc/settings_bloc.dart
+++ b/lib/settings/bloc/settings_bloc.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:core/core.dart';
+import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart';
 
 part 'settings_event.dart';
 part 'settings_state.dart';
@@ -12,13 +12,13 @@ part 'settings_state.dart';
 /// {@template settings_bloc}
 /// Manages the state for the application settings feature.
 ///
-/// Handles loading [UserAppSettings] from [HtDataRepository] and processing
+/// Handles loading [UserAppSettings] from [DataRepository] and processing
 /// user actions to update these settings.
 /// {@endtemplate}
 class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
   /// {@macro settings_bloc}
   SettingsBloc({
-    required HtDataRepository<UserAppSettings> userAppSettingsRepository,
+    required DataRepository<UserAppSettings> userAppSettingsRepository,
   }) : _userAppSettingsRepository = userAppSettingsRepository,
        super(const SettingsState()) {
     // Register event handlers
@@ -52,7 +52,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     // SettingsNotificationsEnabledChanged event and handler removed.
   }
 
-  final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
+  final DataRepository<UserAppSettings> _userAppSettingsRepository;
 
   Future<void> _persistSettings(
     UserAppSettings settingsToSave,
@@ -74,7 +74,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
         item: settingsToSave,
         userId: settingsToSave.id,
       );
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: SettingsStatus.failure, error: e));
     } catch (e) {
       emit(state.copyWith(status: SettingsStatus.failure, error: e));
@@ -124,7 +124,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
       );
       // Persist these default settings
       await _persistSettings(defaultSettings, emit);
-    } on HtHttpException catch (e) {
+    } on HttpException catch (e) {
       emit(state.copyWith(status: SettingsStatus.failure, error: e));
     } catch (e) {
       emit(state.copyWith(status: SettingsStatus.failure, error: e));
diff --git a/lib/settings/bloc/settings_event.dart b/lib/settings/bloc/settings_event.dart
index 3629565..02be7be 100644
--- a/lib/settings/bloc/settings_event.dart
+++ b/lib/settings/bloc/settings_event.dart
@@ -3,7 +3,7 @@ part of 'settings_bloc.dart';
 //
 // ignore_for_file: avoid_positional_boolean_parameters
 
-// Import models and enums from ht_shared
+// Import models and enums from core
 
 /// {@template settings_event}
 /// Base class for all events related to the settings feature.
diff --git a/lib/settings/view/appearance_settings_page.dart b/lib/settings/view/appearance_settings_page.dart
index 7dcb165..6ae1c68 100644
--- a/lib/settings/view/appearance_settings_page.dart
+++ b/lib/settings/view/appearance_settings_page.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template appearance_settings_page}
 /// A menu page for navigating to theme and font appearance settings.
diff --git a/lib/settings/view/feed_settings_page.dart b/lib/settings/view/feed_settings_page.dart
index eb81d33..2ee5ac1 100644
--- a/lib/settings/view/feed_settings_page.dart
+++ b/lib/settings/view/feed_settings_page.dart
@@ -1,11 +1,11 @@
+import 'package:core/core.dart' show HeadlineImageStyle;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/l10n/app_localizations.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_shared/ht_shared.dart' show HeadlineImageStyle;
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template feed_settings_page}
 /// A page for configuring feed display settings.
diff --git a/lib/settings/view/font_settings_page.dart b/lib/settings/view/font_settings_page.dart
index 5f49b52..a15380a 100644
--- a/lib/settings/view/font_settings_page.dart
+++ b/lib/settings/view/font_settings_page.dart
@@ -1,12 +1,11 @@
+import 'package:core/core.dart' show AppFontWeight, AppTextScaleFactor;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/l10n/app_localizations.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_shared/ht_shared.dart'
-    show AppFontWeight, AppTextScaleFactor;
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template font_settings_page}
 /// A page for configuring font-related settings like size, family, and weight.
diff --git a/lib/settings/view/language_settings_page.dart b/lib/settings/view/language_settings_page.dart
index 467a599..24f6e9e 100644
--- a/lib/settings/view/language_settings_page.dart
+++ b/lib/settings/view/language_settings_page.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 // Defines the available languages and their display names.
 // In a real app, this might come from a configuration or be more dynamic.
diff --git a/lib/settings/view/notification_settings_page.dart b/lib/settings/view/notification_settings_page.dart
index f0a8d1f..ee8b549 100644
--- a/lib/settings/view/notification_settings_page.dart
+++ b/lib/settings/view/notification_settings_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template notification_settings_page}
 /// A page for configuring notification settings.
diff --git a/lib/settings/view/settings_page.dart b/lib/settings/view/settings_page.dart
index 2cd36e7..7d3de49 100644
--- a/lib/settings/view/settings_page.dart
+++ b/lib/settings/view/settings_page.dart
@@ -1,12 +1,12 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template settings_page}
 /// The main page for accessing different application settings categories.
@@ -55,7 +55,7 @@ class SettingsPage extends StatelessWidget {
           if (state.status == SettingsStatus.failure) {
             return FailureStateWidget(
               exception:
-                  state.error as HtHttpException? ??
+                  state.error as HttpException? ??
                   const UnknownException('An unknown error occurred'),
               onRetry: () {
                 // Access AppBloc to get the current user ID for retry
diff --git a/lib/settings/view/theme_settings_page.dart b/lib/settings/view/theme_settings_page.dart
index a851fea..f4d5e25 100644
--- a/lib/settings/view/theme_settings_page.dart
+++ b/lib/settings/view/theme_settings_page.dart
@@ -1,11 +1,11 @@
+import 'package:core/core.dart' show AppAccentTheme, AppBaseTheme;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ht_main/app/bloc/app_bloc.dart';
-import 'package:ht_main/l10n/app_localizations.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/settings/bloc/settings_bloc.dart';
-import 'package:ht_shared/ht_shared.dart' show AppAccentTheme, AppBaseTheme;
-import 'package:ht_ui_kit/ht_ui_kit.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template theme_settings_page}
 /// A page for configuring theme-related settings like base and accent themes.
diff --git a/lib/shared/extensions/content_type_extensions.dart b/lib/shared/extensions/content_type_extensions.dart
index 8cf12a8..73bd915 100644
--- a/lib/shared/extensions/content_type_extensions.dart
+++ b/lib/shared/extensions/content_type_extensions.dart
@@ -1,6 +1,6 @@
+import 'package:core/core.dart';
 import 'package:flutter/widgets.dart';
-import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 
 /// An extension on [ContentType] to provide localized display names.
 extension ContentTypeX on ContentType {
diff --git a/lib/shared/services/feed_injector_service.dart b/lib/shared/services/feed_injector_service.dart
index eb83e3f..39a8311 100644
--- a/lib/shared/services/feed_injector_service.dart
+++ b/lib/shared/services/feed_injector_service.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/ht_shared.dart';
+import 'package:core/core.dart';
 import 'package:uuid/uuid.dart';
 
 /// A service responsible for injecting various types of FeedItems (like Ads
diff --git a/lib/shared/widgets/headline_tile_image_start.dart b/lib/shared/widgets/headline_tile_image_start.dart
index 6b9de30..6e93cd5 100644
--- a/lib/shared/widgets/headline_tile_image_start.dart
+++ b/lib/shared/widgets/headline_tile_image_start.dart
@@ -1,10 +1,10 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
 import 'package:timeago/timeago.dart' as timeago;
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template headline_tile_image_start}
 /// A shared widget to display a headline item with a small image at the start.
diff --git a/lib/shared/widgets/headline_tile_image_top.dart b/lib/shared/widgets/headline_tile_image_top.dart
index 6ae541e..8643731 100644
--- a/lib/shared/widgets/headline_tile_image_top.dart
+++ b/lib/shared/widgets/headline_tile_image_top.dart
@@ -1,10 +1,10 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
 import 'package:timeago/timeago.dart' as timeago;
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template headline_tile_image_top}
 /// A shared widget to display a headline item with a large image at the top.
diff --git a/lib/shared/widgets/headline_tile_text_only.dart b/lib/shared/widgets/headline_tile_text_only.dart
index a895095..1986dc3 100644
--- a/lib/shared/widgets/headline_tile_text_only.dart
+++ b/lib/shared/widgets/headline_tile_text_only.dart
@@ -1,10 +1,10 @@
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_main/entity_details/view/entity_details_page.dart';
-import 'package:ht_main/router/routes.dart';
-import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_ui_kit/ht_ui_kit.dart';
 import 'package:timeago/timeago.dart' as timeago;
+import 'package:ui_kit/ui_kit.dart';
 
 /// {@template headline_tile_text_only}
 /// A widget to display a headline item with text only.
diff --git a/pubspec.lock b/pubspec.lock
index 0975732..d85cc50 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b1ade5707ab7a90dfd519eaac78a7184341d19adb6096c68d499b59c7c6cf880
+      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
       url: "https://pub.dev"
     source: hosted
-    version: "7.7.0"
+    version: "7.7.1"
   ansicolor:
     dependency: transitive
     description:
@@ -49,6 +49,42 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.13.0"
+  auth_api:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "94cf789316c23569b7b7d641a5243848749aa079"
+      url: "https://github.com/flutter-news-app-full-source-code/auth-api.git"
+    source: git
+    version: "0.0.0"
+  auth_client:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "8e331975e2df63e2eb6f06d9059309397375bb19"
+      url: "https://github.com/flutter-news-app-full-source-code/auth-client.git"
+    source: git
+    version: "0.0.0"
+  auth_inmemory:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: f48dc0555b1a28ed3c51215f3a93403dbbc46ea0
+      url: "https://github.com/flutter-news-app-full-source-code/auth-inmemory.git"
+    source: git
+    version: "0.0.0"
+  auth_repository:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "390e33098a8e6cbe30934386f4c0fe5b48783b0a"
+      url: "https://github.com/flutter-news-app-full-source-code/auth-repository.git"
+    source: git
+    version: "0.0.0"
   bloc:
     dependency: "direct main"
     description:
@@ -137,6 +173,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  core:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "3022edcb06d7c55ea81f25126b7f8c28c9105d4c"
+      url: "https://github.com/flutter-news-app-full-source-code/core.git"
+    source: git
+    version: "0.0.0"
   coverage:
     dependency: transitive
     description:
@@ -169,6 +214,42 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  data_api:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "2b5691784f32b86e5c9d7d9999fa6dc11fb9a3a0"
+      url: "https://github.com/flutter-news-app-full-source-code/data-api.git"
+    source: git
+    version: "0.0.0"
+  data_client:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "8800311dad6e94bff7fb7a738c8583483bee33ca"
+      url: "https://github.com/flutter-news-app-full-source-code/data-client.git"
+    source: git
+    version: "0.0.0"
+  data_inmemory:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: f12b8a78ee3ca0ca18b356e4c89f1d9171e2be61
+      url: "https://github.com/flutter-news-app-full-source-code/data-inmemory.git"
+    source: git
+    version: "0.0.0"
+  data_repository:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "5a7bd9f597e98209bc7f5ac897cf64552306c02f"
+      url: "https://github.com/flutter-news-app-full-source-code/data-repository.git"
+    source: git
+    version: "0.0.0"
   device_frame:
     dependency: transitive
     description:
@@ -345,10 +426,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175
+      sha256: c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431
       url: "https://pub.dev"
     source: hosted
-    version: "15.1.3"
+    version: "16.0.0"
   google_fonts:
     dependency: "direct main"
     description:
@@ -357,123 +438,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.2.1"
-  ht_auth_api:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: a2fc2a651494831a461fff96807141bdba9cc28b
-      url: "https://github.com/headlines-toolkit/ht-auth-api.git"
-    source: git
-    version: "0.0.0"
-  ht_auth_client:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: a003eb493db4fc134db419a721ee2fda0b598032
-      url: "https://github.com/headlines-toolkit/ht-auth-client.git"
-    source: git
-    version: "0.0.0"
-  ht_auth_inmemory:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: ea9ad0361b1e0beab4690959889b7056091d29dc
-      url: "https://github.com/headlines-toolkit/ht-auth-inmemory"
-    source: git
-    version: "0.0.0"
-  ht_auth_repository:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: b7de5cc86d432b17710c83a1bf8de105bb4fa00d
-      url: "https://github.com/headlines-toolkit/ht-auth-repository.git"
-    source: git
-    version: "0.0.0"
-  ht_data_api:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "16630c8717646663e52eee3ebedc4daa35ec4d39"
-      url: "https://github.com/headlines-toolkit/ht-data-api.git"
-    source: git
-    version: "0.0.0"
-  ht_data_client:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: e566ee6eae5261c00d0987972efc77a37a0c4c3a
-      url: "https://github.com/headlines-toolkit/ht-data-client.git"
-    source: git
-    version: "0.0.0"
-  ht_data_inmemory:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "7945773edb4251d294071820c4ce1b6332f032ec"
-      url: "https://github.com/headlines-toolkit/ht-data-inmemory.git"
-    source: git
-    version: "0.0.0"
-  ht_data_repository:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: f19fe64c67a2febdef853b15f6df9c63240ad48e
-      url: "https://github.com/headlines-toolkit/ht-data-repository.git"
-    source: git
-    version: "0.0.0"
-  ht_http_client:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "3c50cd082406d4cacafe60ad097ba6fa6ba891eb"
-      url: "https://github.com/headlines-toolkit/ht-http-client.git"
-    source: git
-    version: "0.0.0"
-  ht_kv_storage_service:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "2378d6698df1cdeb7c5a17470f94fb8a5a99ca01"
-      url: "https://github.com/headlines-toolkit/ht-kv-storage-service.git"
-    source: git
-    version: "0.0.0"
-  ht_kv_storage_shared_preferences:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "3c65be5424cfe155ec0f35f9a61ddf5c3bdae5cf"
-      url: "https://github.com/headlines-toolkit/ht-kv-storage-shared-preferences.git"
-    source: git
-    version: "0.0.0"
-  ht_shared:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "2f78ac83c319242822250088c1edb11324404cb3"
-      url: "https://github.com/headlines-toolkit/ht-shared.git"
-    source: git
-    version: "0.0.0"
-  ht_ui_kit:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "1c13e5accfa5fad7d262fbc5693780eac6f03fd9"
-      url: "https://github.com/headlines-toolkit/ht-ui-kit.git"
-    source: git
-    version: "0.0.0"
   html:
     dependency: transitive
     description:
@@ -490,6 +454,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  http_client:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: d4b48d57a441a12450724ff14a9796cc0f701754
+      url: "https://github.com/flutter-news-app-full-source-code/http-client.git"
+    source: git
+    version: "0.0.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -554,6 +527,24 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.9.0"
+  kv_storage_service:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "9ab4ec1467a3e97303f26afe193d29a56e42a8f6"
+      url: "https://github.com/flutter-news-app-full-source-code/kv-storage-service.git"
+    source: git
+    version: "0.0.0"
+  kv_storage_shared_preferences:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: f39ef951681e27eadab926fdcf7ece8fc1319a05
+      url: "https://github.com/flutter-news-app-full-source-code/kv-storage-shared-preferences.git"
+    source: git
+    version: "0.0.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -983,6 +974,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  ui_kit:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "21297142a410dd4e0b8af7aa16178ccb3fcdd867"
+      url: "https://github.com/flutter-news-app-full-source-code/ui-kit.git"
+    source: git
+    version: "0.0.0"
   universal_io:
     dependency: transitive
     description:
@@ -1075,10 +1075,10 @@ packages:
     dependency: "direct dev"
     description:
       name: very_good_analysis
-      sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63"
+      sha256: e479fbc0941009262343db308133e121bf8660c2c81d48dd8e952df7b7e1e382
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "9.0.0"
   vm_service:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 106d8c8..7eae33a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,41 @@
-name: ht_main
-description: main headlines toolkit mobile app.
+name: flutter_news_app_mobile_client_full_source_code
+description: Flutter News App - Mobile Client Full Source Code
+
 publish_to: none
-repository: https://github.com/headlines-toolkit/ht-main
+repository: https://github.com/flutter-news-app-full-source-code/flutter-news-app-mobile-client-full-source-code
 environment:
   sdk: ^3.8.0
 
 dependencies:
+  auth_api:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/auth-api.git
+  auth_client:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/auth-client.git
+  auth_inmemory:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/auth-inmemory.git
+  auth_repository:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/auth-repository.git
   bloc: ^9.0.0
   bloc_concurrency: ^0.3.0
+  core:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/core.git
+  data_api:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/data-api.git
+  data_client:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/data-client.git
+  data_inmemory:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/data-inmemory.git
+  data_repository:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/data-repository.git
   device_preview: ^1.2.0
   equatable: ^2.0.7
   flex_color_scheme: ^8.2.0
@@ -19,54 +47,27 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_native_splash: ^2.4.5
-  go_router: ^15.0.0
+  go_router: ^16.0.0
   google_fonts: ^6.2.1
-  ht_auth_api:
-    git:
-      url: https://github.com/headlines-toolkit/ht-auth-api.git
-  ht_auth_client:
-    git:
-      url: https://github.com/headlines-toolkit/ht-auth-client.git
-  ht_auth_inmemory:
-    git:
-      url: https://github.com/headlines-toolkit/ht-auth-inmemory
-  ht_auth_repository:
+  http_client:
     git:
-      url: https://github.com/headlines-toolkit/ht-auth-repository.git
-  ht_data_api:
-    git:
-      url: https://github.com/headlines-toolkit/ht-data-api.git
-  ht_data_client:
-    git:
-      url: https://github.com/headlines-toolkit/ht-data-client.git
-  ht_data_inmemory:
-    git:
-      url: https://github.com/headlines-toolkit/ht-data-inmemory.git
-  ht_data_repository:
-    git:
-      url: https://github.com/headlines-toolkit/ht-data-repository.git
-  ht_http_client:
-    git:
-      url: https://github.com/headlines-toolkit/ht-http-client.git
-  ht_kv_storage_service:
-    git:
-      url: https://github.com/headlines-toolkit/ht-kv-storage-service.git
-  ht_kv_storage_shared_preferences:
-    git:
-      url: https://github.com/headlines-toolkit/ht-kv-storage-shared-preferences.git
-  ht_shared:
-    git:
-      url: https://github.com/headlines-toolkit/ht-shared.git
-  ht_ui_kit:
-    git:
-      url: https://github.com/headlines-toolkit/ht-ui-kit.git
+      url: https://github.com/flutter-news-app-full-source-code/http-client.git
   intl: ^0.20.2
   js_interop: ^0.0.1
+  kv_storage_service:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/kv-storage-service.git
+  kv_storage_shared_preferences:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/kv-storage-shared-preferences.git
   logging: ^1.3.0
   meta: ^1.16.0
   share_plus: ^11.0.0
   stream_transform: ^2.1.1
   timeago: ^3.7.1
+  ui_kit:
+    git:
+      url: https://github.com/flutter-news-app-full-source-code/ui-kit.git
   url_launcher: ^6.3.1
   uuid: ^4.4.0
 
@@ -75,7 +76,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.4
-  very_good_analysis: ^7.0.0
+  very_good_analysis: ^9.0.0
 
 flutter:
   uses-material-design: true