diff --git a/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart b/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart
index cecb2214..d9797e17 100644
--- a/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart
+++ b/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart
@@ -1,7 +1,7 @@
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
 import 'package:hub/shared/utils/limited_text_size.dart';
 import 'package:hub/shared/utils/validator_util.dart';
diff --git a/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart b/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart
index 84cdf9ba..2a788357 100644
--- a/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart
+++ b/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart
@@ -4,7 +4,7 @@ import 'package:flutter_animate/flutter_animate.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hub/components/atomic_components/shared_components_atoms/atom_image_svg_theme.dart';
 import 'package:hub/components/atomic_components/term_of_use/atom_terms_of_use.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/shared/utils/dialog_util.dart';
 import 'package:hub/shared/utils/limited_text_size.dart';
 import 'package:hub/shared/utils/log_util.dart';
diff --git a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart
index d0cff70a..3ad2c626 100644
--- a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart
+++ b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart
@@ -4,7 +4,7 @@ import 'package:flutter_animate/flutter_animate.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hub/components/atomic_components/shared_components_atoms/atom_image_svg_theme.dart';
 import 'package:hub/components/atomic_components/term_of_use/atom_terms_of_use.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/storage/index.dart';
 
 import 'package:hub/shared/utils/limited_text_size.dart';
diff --git a/lib/features/authentication/authentication_service.dart b/lib/features/auth/authentication_service.dart
similarity index 97%
rename from lib/features/authentication/authentication_service.dart
rename to lib/features/auth/authentication_service.dart
index 4c5e8fea..12393545 100644
--- a/lib/features/authentication/authentication_service.dart
+++ b/lib/features/auth/authentication_service.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hub/features/backend/index.dart';
-import 'package:hub/features/locals/index.dart';
-import 'package:hub/features/modules/data/repositories/license_repository_impl.dart';
+import 'package:hub/features/local/index.dart';
+import 'package:hub/features/module/data/repositories/license_repository_impl.dart';
 import 'package:hub/features/storage/index.dart';
 
 import 'package:hub/flutter_flow/nav/nav.dart';
@@ -153,7 +153,7 @@ class AuthenticationService {
     await StorageHelper().clean(Storage.secureStorage);
     await LicenseRepositoryImpl().cleanLicense();
     DatabaseService.isInitialized = false;
-    await StorageHelper().init();
+    await DatabaseService.instance.init();
 
     context.go('/welcomePage', extra: extra);
   }
diff --git a/lib/features/authentication/index.dart b/lib/features/auth/index.dart
similarity index 100%
rename from lib/features/authentication/index.dart
rename to lib/features/auth/index.dart
diff --git a/lib/features/backend/api_requests/api_calls.dart b/lib/features/backend/api_requests/api_calls.dart
index e7ab6772..b5665bea 100644
--- a/lib/features/backend/api_requests/api_calls.dart
+++ b/lib/features/backend/api_requests/api_calls.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'dart:developer';
 
 import 'package:flutter/foundation.dart';
-import 'package:hub/features/notifications/index.dart';
+import 'package:hub/features/notification/index.dart';
 import 'package:hub/features/storage/index.dart';
 
 import 'package:hub/shared/utils/log_util.dart';
diff --git a/lib/features/home/presentation/blocs/home_bloc.dart b/lib/features/home/presentation/blocs/home_bloc.dart
index 32efb9ab..c7b69418 100644
--- a/lib/features/home/presentation/blocs/home_bloc.dart
+++ b/lib/features/home/presentation/blocs/home_bloc.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 import 'package:hub/features/storage/index.dart';
 
 import 'index.dart';
diff --git a/lib/features/home/presentation/pages/home_page.dart b/lib/features/home/presentation/pages/home_page.dart
index b11c8bdd..f3a9df42 100644
--- a/lib/features/home/presentation/pages/home_page.dart
+++ b/lib/features/home/presentation/pages/home_page.dart
@@ -7,7 +7,7 @@ import 'package:hub/features/menu/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_icon_button.dart';
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 class HomePageWidget extends StatefulWidget {
   const HomePageWidget(this.update, {super.key});
diff --git a/lib/features/home/presentation/widgets/drawer_widget.dart b/lib/features/home/presentation/widgets/drawer_widget.dart
index 9e681c10..014fa9f8 100644
--- a/lib/features/home/presentation/widgets/drawer_widget.dart
+++ b/lib/features/home/presentation/widgets/drawer_widget.dart
@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hub/features/home/index.dart';
 import 'package:hub/features/menu/index.dart';
-import 'package:hub/features/modules/data/index.dart';
+import 'package:hub/features/module/data/index.dart';
 
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 class DrawerWidget extends StatelessWidget {
   const DrawerWidget({super.key});
diff --git a/lib/features/locals/data/data_sources/index.dart b/lib/features/local/data/data_sources/index.dart
similarity index 100%
rename from lib/features/locals/data/data_sources/index.dart
rename to lib/features/local/data/data_sources/index.dart
diff --git a/lib/features/local/data/data_sources/locals_local_data_source.dart b/lib/features/local/data/data_sources/locals_local_data_source.dart
new file mode 100644
index 00000000..8fb385cd
--- /dev/null
+++ b/lib/features/local/data/data_sources/locals_local_data_source.dart
@@ -0,0 +1,74 @@
+import 'dart:developer';
+
+import 'package:hub/features/storage/constants/locals_constants.dart';
+import 'package:hub/features/storage/index.dart';
+import 'package:sqflite/sqflite.dart';
+
+abstract class LocalsLocalDataSource implements BaseStorage {}
+
+class LocalsLocalDataSourceImpl implements LocalsLocalDataSource {
+  static final LocalsLocalDataSourceImpl _instance =
+      LocalsLocalDataSourceImpl._internal();
+  factory LocalsLocalDataSourceImpl() => _instance;
+  LocalsLocalDataSourceImpl._internal();
+
+  bool _isInitialized = false;
+
+  @override
+  Future<void> init() async {
+    if (_isInitialized) return;
+    await DatabaseService.instance.init();
+    _isInitialized = true;
+  }
+
+  @override
+  Future<String?> get(String key) async {
+    final String? local =
+        await StorageHelper().get(ProfileStorageKey.clientUUID.key);
+    var response = await DatabaseService.database.query(
+        LocalsConstants.tableLocalsKeychain,
+        where: 'key = ? AND local = ?',
+        whereArgs: [key, local]);
+    if (response.isEmpty) {
+      return null;
+    }
+    return response.first['value'].toString();
+  }
+
+  @override
+  Future<void> set<T>(String key, T value) async {
+    var date = DateTime.now().toIso8601String();
+    final String? local =
+        await StorageHelper().get(ProfileStorageKey.clientUUID.key);
+    await DatabaseService.database.insert(
+        LocalsConstants.tableLocalsKeychain,
+        {
+          'key': key,
+          'value': value.toString(),
+          'type': 'local',
+          'updateAt': date,
+          'resolvedAt': date,
+          'createdAt': date,
+          'locals': local
+        },
+        conflictAlgorithm: ConflictAlgorithm.replace);
+  }
+
+  @override
+  Future<void> delete(String key) async {
+    final String? local =
+        await StorageHelper().get(ProfileStorageKey.clientUUID.key);
+    await DatabaseService.database.delete(LocalsConstants.tableLocalsKeychain,
+        where: 'key = ? AND local = ?', whereArgs: [key, local]);
+  }
+
+  @override
+  Future<void> clearAll() async {
+    try {
+      await DatabaseService.database
+          .delete(LocalsConstants.tableLocalsKeychain);
+    } catch (e, s) {
+      log('() => clearAll keychain: $e', stackTrace: s);
+    }
+  }
+}
diff --git a/lib/features/locals/data/data_sources/locals_remote_data_source.dart b/lib/features/local/data/data_sources/locals_remote_data_source.dart
similarity index 98%
rename from lib/features/locals/data/data_sources/locals_remote_data_source.dart
rename to lib/features/local/data/data_sources/locals_remote_data_source.dart
index 3b656e62..b39ff764 100644
--- a/lib/features/locals/data/data_sources/locals_remote_data_source.dart
+++ b/lib/features/local/data/data_sources/locals_remote_data_source.dart
@@ -4,14 +4,14 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:hub/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/backend/index.dart';
-import 'package:hub/features/modules/data/index.dart';
+import 'package:hub/features/module/data/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
 import 'package:hub/flutter_flow/internationalization.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 import 'package:hub/shared/utils/snackbar_util.dart';
 
 abstract class LocalsRemoteDataSource {
diff --git a/lib/features/locals/data/index.dart b/lib/features/local/data/index.dart
similarity index 100%
rename from lib/features/locals/data/index.dart
rename to lib/features/local/data/index.dart
diff --git a/lib/features/locals/data/models/index.dart b/lib/features/local/data/models/index.dart
similarity index 100%
rename from lib/features/locals/data/models/index.dart
rename to lib/features/local/data/models/index.dart
diff --git a/lib/features/locals/data/repositories/index.dart b/lib/features/local/data/repositories/index.dart
similarity index 100%
rename from lib/features/locals/data/repositories/index.dart
rename to lib/features/local/data/repositories/index.dart
diff --git a/lib/features/locals/data/repositories/locals_repository_impl.dart b/lib/features/local/data/repositories/locals_repository_impl.dart
similarity index 86%
rename from lib/features/locals/data/repositories/locals_repository_impl.dart
rename to lib/features/local/data/repositories/locals_repository_impl.dart
index 5957c051..e14e4227 100644
--- a/lib/features/locals/data/repositories/locals_repository_impl.dart
+++ b/lib/features/local/data/repositories/locals_repository_impl.dart
@@ -2,10 +2,10 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 import 'package:hub/features/menu/index.dart';
-import 'package:hub/features/modules/data/index.dart';
-import 'package:hub/features/notifications/index.dart';
+import 'package:hub/features/module/data/index.dart';
+import 'package:hub/features/notification/index.dart';
 import 'package:hub/features/storage/index.dart';
 
 import 'package:hub/shared/utils/dialog_util.dart';
@@ -32,10 +32,16 @@ class LocalsRepositoryImpl implements LocalsRepository {
   }
 
   Future<void> select(BuildContext context) async {
-    await localDataSource.unlinkLocal();
+    await unselect();
     await update(context);
   }
 
+  Future<void> unselect() async {
+    await StorageHelper().set(ProfileStorageKey.clientUUID.key, '');
+    await StorageHelper().set(ProfileStorageKey.clientName.key, '');
+    await StorageHelper().set(ProfileStorageKey.ownerName.key, '');
+  }
+
   Future<void> check(BuildContext context) async {
     final String? cliUUID =
         await StorageHelper().get(ProfileStorageKey.clientUUID.key);
diff --git a/lib/features/locals/domain/entities/index.dart b/lib/features/local/domain/entities/index.dart
similarity index 100%
rename from lib/features/locals/domain/entities/index.dart
rename to lib/features/local/domain/entities/index.dart
diff --git a/lib/features/locals/domain/index.dart b/lib/features/local/domain/index.dart
similarity index 100%
rename from lib/features/locals/domain/index.dart
rename to lib/features/local/domain/index.dart
diff --git a/lib/features/locals/domain/respositories/index.dart b/lib/features/local/domain/respositories/index.dart
similarity index 100%
rename from lib/features/locals/domain/respositories/index.dart
rename to lib/features/local/domain/respositories/index.dart
diff --git a/lib/features/locals/domain/respositories/locals_repository.dart b/lib/features/local/domain/respositories/locals_repository.dart
similarity index 100%
rename from lib/features/locals/domain/respositories/locals_repository.dart
rename to lib/features/local/domain/respositories/locals_repository.dart
diff --git a/lib/features/locals/domain/usecases/index.dart b/lib/features/local/domain/usecases/index.dart
similarity index 100%
rename from lib/features/locals/domain/usecases/index.dart
rename to lib/features/local/domain/usecases/index.dart
diff --git a/lib/features/locals/index.dart b/lib/features/local/index.dart
similarity index 100%
rename from lib/features/locals/index.dart
rename to lib/features/local/index.dart
diff --git a/lib/features/locals/presentation/blocs/index.dart b/lib/features/local/presentation/blocs/index.dart
similarity index 100%
rename from lib/features/locals/presentation/blocs/index.dart
rename to lib/features/local/presentation/blocs/index.dart
diff --git a/lib/features/locals/presentation/blocs/local_profile_bloc.dart b/lib/features/local/presentation/blocs/local_profile_bloc.dart
similarity index 98%
rename from lib/features/locals/presentation/blocs/local_profile_bloc.dart
rename to lib/features/local/presentation/blocs/local_profile_bloc.dart
index 60b9b720..bca9c819 100644
--- a/lib/features/locals/presentation/blocs/local_profile_bloc.dart
+++ b/lib/features/local/presentation/blocs/local_profile_bloc.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_model.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 class LocalProfileEvent {}
 
diff --git a/lib/features/locals/presentation/index.dart b/lib/features/local/presentation/index.dart
similarity index 100%
rename from lib/features/locals/presentation/index.dart
rename to lib/features/local/presentation/index.dart
diff --git a/lib/features/locals/presentation/widgets/index.dart b/lib/features/local/presentation/widgets/index.dart
similarity index 100%
rename from lib/features/locals/presentation/widgets/index.dart
rename to lib/features/local/presentation/widgets/index.dart
diff --git a/lib/features/locals/presentation/widgets/local_profile/index.dart b/lib/features/local/presentation/widgets/local_profile/index.dart
similarity index 100%
rename from lib/features/locals/presentation/widgets/local_profile/index.dart
rename to lib/features/local/presentation/widgets/local_profile/index.dart
diff --git a/lib/features/locals/presentation/widgets/local_profile/local_profile_widget.dart b/lib/features/local/presentation/widgets/local_profile/local_profile_widget.dart
similarity index 99%
rename from lib/features/locals/presentation/widgets/local_profile/local_profile_widget.dart
rename to lib/features/local/presentation/widgets/local_profile/local_profile_widget.dart
index e3db9435..b3018ce6 100644
--- a/lib/features/locals/presentation/widgets/local_profile/local_profile_widget.dart
+++ b/lib/features/local/presentation/widgets/local_profile/local_profile_widget.dart
@@ -2,11 +2,11 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
 import 'package:hub/flutter_flow/custom_functions.dart';
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 class LocalProfileComponentWidget extends StatefulWidget {
   const LocalProfileComponentWidget({super.key});
diff --git a/lib/features/locals/utils/index.dart b/lib/features/local/utils/index.dart
similarity index 100%
rename from lib/features/locals/utils/index.dart
rename to lib/features/local/utils/index.dart
diff --git a/lib/features/locals/utils/local_util.dart b/lib/features/local/utils/local_util.dart
similarity index 99%
rename from lib/features/locals/utils/local_util.dart
rename to lib/features/local/utils/local_util.dart
index 0aa0cb85..498b8834 100644
--- a/lib/features/locals/utils/local_util.dart
+++ b/lib/features/local/utils/local_util.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:hub/features/backend/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/internationalization.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 import 'package:hub/shared/utils/dialog_util.dart';
 import 'package:hub/shared/utils/log_util.dart';
diff --git a/lib/features/locals/data/data_sources/locals_local_data_source.dart b/lib/features/locals/data/data_sources/locals_local_data_source.dart
deleted file mode 100644
index 32445b40..00000000
--- a/lib/features/locals/data/data_sources/locals_local_data_source.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'package:hub/features/storage/index.dart';
-
-abstract class LocalsLocalDataSource {
-  Future<void> unlinkLocal();
-}
-
-class LocalsLocalDataSourceImpl {
-  Future<void> unlinkLocal() async {
-    await StorageHelper().set(ProfileStorageKey.clientUUID.key, '');
-    await StorageHelper().set(ProfileStorageKey.clientName.key, '');
-    await StorageHelper().set(ProfileStorageKey.ownerName.key, '');
-  }
-}
diff --git a/lib/features/menu/data/data_sources/menu_local_data_source.dart b/lib/features/menu/data/data_sources/menu_local_data_source.dart
index d12ecc93..8b5c4421 100644
--- a/lib/features/menu/data/data_sources/menu_local_data_source.dart
+++ b/lib/features/menu/data/data_sources/menu_local_data_source.dart
@@ -1,14 +1,13 @@
 import 'dart:developer';
 
 import 'package:flutter/material.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/menu/index.dart';
+import 'package:hub/features/module/index.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
 import 'package:hub/shared/extensions/dialog_extensions.dart';
 import 'package:hub/shared/utils/path_util.dart';
 
-import '../../../modules/domain/entities/index.dart';
-
 abstract class MenuLocalDataSource {
   Future<MenuItem?> addMenuEntry(EnumMenuItem item, List<MenuItem?> entries,
       IconData icon, String text, Function() action);
diff --git a/lib/features/menu/data/repositories/menu_repository_impl.dart b/lib/features/menu/data/repositories/menu_repository_impl.dart
index 4f6d7f5d..c5642310 100644
--- a/lib/features/menu/data/repositories/menu_repository_impl.dart
+++ b/lib/features/menu/data/repositories/menu_repository_impl.dart
@@ -1,7 +1,7 @@
 import 'dart:developer';
 
 import 'package:hub/features/menu/index.dart';
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
 import 'package:hub/flutter_flow/custom_functions.dart';
 
 class MenuRepositoryImpl implements MenuRepository {
diff --git a/lib/features/menu/presentation/blocs/menu_bloc.dart b/lib/features/menu/presentation/blocs/menu_bloc.dart
index c1b7e205..4d4bb797 100644
--- a/lib/features/menu/presentation/blocs/menu_bloc.dart
+++ b/lib/features/menu/presentation/blocs/menu_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hub/features/menu/index.dart';
-import 'package:hub/features/modules/index.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/module/index.dart';
+import 'package:hub/features/local/index.dart';
 
 class MenuEvent {}
 
diff --git a/lib/features/menu/presentation/mappers/menu_entry.dart b/lib/features/menu/presentation/mappers/menu_entry.dart
index c9796188..426da056 100644
--- a/lib/features/menu/presentation/mappers/menu_entry.dart
+++ b/lib/features/menu/presentation/mappers/menu_entry.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
 import 'package:hub/flutter_flow/internationalization.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
 
diff --git a/lib/features/menu/presentation/widgets/menu_factory.dart b/lib/features/menu/presentation/widgets/menu_factory.dart
index 3092a115..2229d20f 100644
--- a/lib/features/menu/presentation/widgets/menu_factory.dart
+++ b/lib/features/menu/presentation/widgets/menu_factory.dart
@@ -1,8 +1,8 @@
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hub/features/menu/index.dart';
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
 
 import 'package:hub/shared/utils/loading_util.dart';
 
diff --git a/lib/features/modules/constants/index.dart b/lib/features/module/constants/index.dart
similarity index 100%
rename from lib/features/modules/constants/index.dart
rename to lib/features/module/constants/index.dart
diff --git a/lib/features/modules/constants/license_constants.dart b/lib/features/module/constants/license_constants.dart
similarity index 100%
rename from lib/features/modules/constants/license_constants.dart
rename to lib/features/module/constants/license_constants.dart
diff --git a/lib/features/modules/data/data_sources/index.dart b/lib/features/module/data/data_sources/index.dart
similarity index 100%
rename from lib/features/modules/data/data_sources/index.dart
rename to lib/features/module/data/data_sources/index.dart
diff --git a/lib/features/modules/data/data_sources/license_local_data_source.dart b/lib/features/module/data/data_sources/license_local_data_source.dart
similarity index 97%
rename from lib/features/modules/data/data_sources/license_local_data_source.dart
rename to lib/features/module/data/data_sources/license_local_data_source.dart
index e2ef21aa..25251b41 100644
--- a/lib/features/modules/data/data_sources/license_local_data_source.dart
+++ b/lib/features/module/data/data_sources/license_local_data_source.dart
@@ -1,4 +1,4 @@
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/shared/extensions/string_extensions.dart';
 
diff --git a/lib/features/modules/data/data_sources/license_remote_data_source.dart b/lib/features/module/data/data_sources/license_remote_data_source.dart
similarity index 96%
rename from lib/features/modules/data/data_sources/license_remote_data_source.dart
rename to lib/features/module/data/data_sources/license_remote_data_source.dart
index 5a80c9c7..124f432d 100644
--- a/lib/features/modules/data/data_sources/license_remote_data_source.dart
+++ b/lib/features/module/data/data_sources/license_remote_data_source.dart
@@ -4,8 +4,8 @@ import 'dart:async';
 import 'dart:developer';
 
 import 'package:hub/features/backend/index.dart';
-import 'package:hub/features/locals/data/repositories/locals_repository_impl.dart';
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/local/data/repositories/locals_repository_impl.dart';
+import 'package:hub/features/module/index.dart';
 
 import 'package:sqflite/sqflite.dart';
 
diff --git a/lib/features/modules/data/index.dart b/lib/features/module/data/index.dart
similarity index 100%
rename from lib/features/modules/data/index.dart
rename to lib/features/module/data/index.dart
diff --git a/lib/features/modules/data/models/index.dart b/lib/features/module/data/models/index.dart
similarity index 100%
rename from lib/features/modules/data/models/index.dart
rename to lib/features/module/data/models/index.dart
diff --git a/lib/features/modules/data/models/license_model.dart b/lib/features/module/data/models/license_model.dart
similarity index 100%
rename from lib/features/modules/data/models/license_model.dart
rename to lib/features/module/data/models/license_model.dart
diff --git a/lib/features/modules/data/models/license_model.freezed.dart b/lib/features/module/data/models/license_model.freezed.dart
similarity index 100%
rename from lib/features/modules/data/models/license_model.freezed.dart
rename to lib/features/module/data/models/license_model.freezed.dart
diff --git a/lib/features/modules/data/models/license_model.g.dart b/lib/features/module/data/models/license_model.g.dart
similarity index 100%
rename from lib/features/modules/data/models/license_model.g.dart
rename to lib/features/module/data/models/license_model.g.dart
diff --git a/lib/features/modules/data/models/module_model.dart b/lib/features/module/data/models/module_model.dart
similarity index 100%
rename from lib/features/modules/data/models/module_model.dart
rename to lib/features/module/data/models/module_model.dart
diff --git a/lib/features/modules/data/models/module_model.freezed.dart b/lib/features/module/data/models/module_model.freezed.dart
similarity index 100%
rename from lib/features/modules/data/models/module_model.freezed.dart
rename to lib/features/module/data/models/module_model.freezed.dart
diff --git a/lib/features/modules/data/models/module_model.g.dart b/lib/features/module/data/models/module_model.g.dart
similarity index 100%
rename from lib/features/modules/data/models/module_model.g.dart
rename to lib/features/module/data/models/module_model.g.dart
diff --git a/lib/features/modules/data/repositories/index.dart b/lib/features/module/data/repositories/index.dart
similarity index 100%
rename from lib/features/modules/data/repositories/index.dart
rename to lib/features/module/data/repositories/index.dart
diff --git a/lib/features/modules/data/repositories/license_repository_impl.dart b/lib/features/module/data/repositories/license_repository_impl.dart
similarity index 90%
rename from lib/features/modules/data/repositories/license_repository_impl.dart
rename to lib/features/module/data/repositories/license_repository_impl.dart
index 0a5a5b48..a201b543 100644
--- a/lib/features/modules/data/repositories/license_repository_impl.dart
+++ b/lib/features/module/data/repositories/license_repository_impl.dart
@@ -1,7 +1,7 @@
 import 'dart:developer';
 
-import 'package:hub/features/modules/data/data_sources/index.dart';
-import 'package:hub/features/modules/domain/index.dart';
+import 'package:hub/features/module/data/data_sources/index.dart';
+import 'package:hub/features/module/domain/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:sqflite/sqflite.dart';
 
diff --git a/lib/features/modules/domain/entities/base_module.dart b/lib/features/module/domain/entities/base_module.dart
similarity index 100%
rename from lib/features/modules/domain/entities/base_module.dart
rename to lib/features/module/domain/entities/base_module.dart
diff --git a/lib/features/modules/domain/entities/index.dart b/lib/features/module/domain/entities/index.dart
similarity index 100%
rename from lib/features/modules/domain/entities/index.dart
rename to lib/features/module/domain/entities/index.dart
diff --git a/lib/features/modules/domain/entities/license.dart b/lib/features/module/domain/entities/license.dart
similarity index 100%
rename from lib/features/modules/domain/entities/license.dart
rename to lib/features/module/domain/entities/license.dart
diff --git a/lib/features/modules/domain/entities/module.dart b/lib/features/module/domain/entities/module.dart
similarity index 96%
rename from lib/features/modules/domain/entities/module.dart
rename to lib/features/module/domain/entities/module.dart
index 43cff382..a0b36a12 100644
--- a/lib/features/modules/domain/entities/module.dart
+++ b/lib/features/module/domain/entities/module.dart
@@ -1,4 +1,4 @@
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
 
 enum ModuleStatus { active, inactive, disabled }
 
diff --git a/lib/features/modules/domain/index.dart b/lib/features/module/domain/index.dart
similarity index 100%
rename from lib/features/modules/domain/index.dart
rename to lib/features/module/domain/index.dart
diff --git a/lib/features/modules/domain/respositories/index.dart b/lib/features/module/domain/respositories/index.dart
similarity index 100%
rename from lib/features/modules/domain/respositories/index.dart
rename to lib/features/module/domain/respositories/index.dart
diff --git a/lib/features/modules/domain/respositories/license_repository.dart b/lib/features/module/domain/respositories/license_repository.dart
similarity index 100%
rename from lib/features/modules/domain/respositories/license_repository.dart
rename to lib/features/module/domain/respositories/license_repository.dart
diff --git a/lib/features/modules/domain/usecases/index.dart b/lib/features/module/domain/usecases/index.dart
similarity index 100%
rename from lib/features/modules/domain/usecases/index.dart
rename to lib/features/module/domain/usecases/index.dart
diff --git a/lib/features/modules/index.dart b/lib/features/module/index.dart
similarity index 100%
rename from lib/features/modules/index.dart
rename to lib/features/module/index.dart
diff --git a/lib/features/modules/presentation/blocs/index.dart b/lib/features/module/presentation/blocs/index.dart
similarity index 100%
rename from lib/features/modules/presentation/blocs/index.dart
rename to lib/features/module/presentation/blocs/index.dart
diff --git a/lib/features/modules/presentation/index.dart b/lib/features/module/presentation/index.dart
similarity index 100%
rename from lib/features/modules/presentation/index.dart
rename to lib/features/module/presentation/index.dart
diff --git a/lib/features/modules/presentation/widgets/index.dart b/lib/features/module/presentation/widgets/index.dart
similarity index 100%
rename from lib/features/modules/presentation/widgets/index.dart
rename to lib/features/module/presentation/widgets/index.dart
diff --git a/lib/features/notifications/deep_link_service.dart b/lib/features/notification/deep_link_service.dart
similarity index 100%
rename from lib/features/notifications/deep_link_service.dart
rename to lib/features/notification/deep_link_service.dart
diff --git a/lib/features/notifications/firebase_messaging_service.dart b/lib/features/notification/firebase_messaging_service.dart
similarity index 97%
rename from lib/features/notifications/firebase_messaging_service.dart
rename to lib/features/notification/firebase_messaging_service.dart
index 3d4a77f7..68fc300a 100644
--- a/lib/features/notifications/firebase_messaging_service.dart
+++ b/lib/features/notification/firebase_messaging_service.dart
@@ -2,7 +2,7 @@ import 'dart:developer';
 
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:hub/features/backend/index.dart';
-import 'package:hub/features/storage/data/index.dart';
+import 'package:hub/features/storage/index.dart';
 
 import 'package:hub/shared/utils/log_util.dart';
 
diff --git a/lib/features/notifications/index.dart b/lib/features/notification/index.dart
similarity index 100%
rename from lib/features/notifications/index.dart
rename to lib/features/notification/index.dart
diff --git a/lib/features/notifications/notification_service.dart b/lib/features/notification/notification_service.dart
similarity index 100%
rename from lib/features/notifications/notification_service.dart
rename to lib/features/notification/notification_service.dart
diff --git a/lib/features/profile/data/data_sources/profile_local_data_source.dart b/lib/features/profile/data/data_sources/profile_local_data_source.dart
index 481f5b67..8b0f9d1e 100644
--- a/lib/features/profile/data/data_sources/profile_local_data_source.dart
+++ b/lib/features/profile/data/data_sources/profile_local_data_source.dart
@@ -1,5 +1,6 @@
 import 'dart:developer';
 
+import 'package:hub/features/storage/constants/profile_constants.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/shared/constants/index.dart';
 
@@ -7,11 +8,11 @@ import 'package:sqflite/sqflite.dart';
 
 abstract class ProfileLocalDataSource implements DatabaseStorage {}
 
-class ProfileLocalDataSourceImpl implements BaseStorage {
-  ProfileLocalDataSourceImpl._();
-
-  static final ProfileLocalDataSourceImpl instance =
-      ProfileLocalDataSourceImpl._();
+class ProfileLocalDataSourceImpl implements ProfileLocalDataSource {
+  static final ProfileLocalDataSourceImpl _instance =
+      ProfileLocalDataSourceImpl._internal();
+  factory ProfileLocalDataSourceImpl() => _instance;
+  ProfileLocalDataSourceImpl._internal();
 
   bool _isInitialized = false;
 
diff --git a/lib/features/storage/constants/index.dart b/lib/features/storage/constants/index.dart
new file mode 100644
index 00000000..674329bd
--- /dev/null
+++ b/lib/features/storage/constants/index.dart
@@ -0,0 +1,2 @@
+export 'locals_constants.dart';
+export 'profile_constants.dart';
diff --git a/lib/features/storage/constants/locals_constants.dart b/lib/features/storage/constants/locals_constants.dart
new file mode 100644
index 00000000..544defd4
--- /dev/null
+++ b/lib/features/storage/constants/locals_constants.dart
@@ -0,0 +1,17 @@
+class LocalsConstants {
+  static const String tableLocalsKeychain = 'LocalsKeychain';
+
+  static String get createLocalsTable => '''
+    CREATE TABLE IF NOT EXISTS $tableLocalsKeychain (
+      key TEXT,
+      value TEXT,
+      type TEXT,
+      updateAt TEXT,
+      resolvedAt TEXT,
+      createdAt TEXT,
+      local TEXT
+    );
+  ''';
+  static String get deleteLocalsTable =>
+      'DROP TABLE IF EXISTS $tableLocalsKeychain;';
+}
diff --git a/lib/shared/constants/keychain_constants.dart b/lib/features/storage/constants/profile_constants.dart
similarity index 100%
rename from lib/shared/constants/keychain_constants.dart
rename to lib/features/storage/constants/profile_constants.dart
diff --git a/lib/features/storage/enums/database_storage.dart b/lib/features/storage/enums/database_storage_key.dart
similarity index 94%
rename from lib/features/storage/enums/database_storage.dart
rename to lib/features/storage/enums/database_storage_key.dart
index 9fab3420..f4028646 100644
--- a/lib/features/storage/enums/database_storage.dart
+++ b/lib/features/storage/enums/database_storage_key.dart
@@ -18,7 +18,7 @@ enum ProfileStorageKey implements DatabaseStorageKey {
 
   static const String table = 'profileTable';
 
-  static List<String> get values =>
+  static List<String> get keys =>
       ProfileStorageKey.values.map((e) => e.key).toList();
 }
 
@@ -42,6 +42,6 @@ enum LocalsStorageKey implements DatabaseStorageKey {
 
   static const String table = 'LocalsStorageKey';
 
-  static List<String> get values =>
+  static List<String> get keys =>
       LocalsStorageKey.values.map((e) => e.key).toList();
 }
diff --git a/lib/features/storage/enums/index.dart b/lib/features/storage/enums/index.dart
index c840252e..ac61a5b2 100644
--- a/lib/features/storage/enums/index.dart
+++ b/lib/features/storage/enums/index.dart
@@ -1,4 +1,4 @@
-export 'database_storage.dart';
-export 'secure_storage.dart';
-export 'shared_storage.dart';
+export 'database_storage_key.dart';
+export 'secure_storage_key.dart';
+export 'shared_storage_key.dart';
 export 'storage.dart';
diff --git a/lib/features/storage/enums/secure_storage.dart b/lib/features/storage/enums/secure_storage_key.dart
similarity index 100%
rename from lib/features/storage/enums/secure_storage.dart
rename to lib/features/storage/enums/secure_storage_key.dart
diff --git a/lib/features/storage/enums/shared_storage.dart b/lib/features/storage/enums/shared_storage_key.dart
similarity index 100%
rename from lib/features/storage/enums/shared_storage.dart
rename to lib/features/storage/enums/shared_storage_key.dart
diff --git a/lib/features/storage/helpers/dabase_storage_helper.dart b/lib/features/storage/helpers/dabase_storage_helper.dart
index aa04e1d7..63839577 100644
--- a/lib/features/storage/helpers/dabase_storage_helper.dart
+++ b/lib/features/storage/helpers/dabase_storage_helper.dart
@@ -1,3 +1,4 @@
+import 'package:hub/features/local/index.dart';
 import 'package:hub/features/profile/index.dart';
 import 'package:hub/features/storage/index.dart';
 
@@ -11,20 +12,28 @@ class DatabaseStorage implements BaseStorage {
   // bool _isInitialized = false;
 
   static BaseStorage getInstanceByKey(String key) {
-    if (ProfileStorageKey.values.contains(key))
-      return ProfileLocalDataSourceImpl.instance(key);
-    else //if (LocalsStorageKey.values.contains(key));
-      return LocalsStorageKey.instance(key);
+    if (ProfileStorageKey.keys.contains(key)) //
+    {
+      return ProfileLocalDataSourceImpl();
+    } else //if (LocalsStorageKey.values.contains(key))
+    {
+      return LocalsLocalDataSourceImpl();
+    }
   }
 
   @override
-  Future<void> clearAll() => throw UnimplementedError();
+  Future<void> clearAll() => //
+      throw UnimplementedError();
   @override
-  Future<void> delete(String key) => throw UnimplementedError();
+  Future<void> delete(String key) async =>
+      await getInstanceByKey(key).delete(key);
   @override
-  Future<String?> get(String key) => throw UnimplementedError();
+  Future<String?> get(String key) async => //
+      await getInstanceByKey(key).get(key);
   @override
-  Future<void> init() => throw UnimplementedError();
+  Future<void> init() async => //
+      await DatabaseService.instance.init();
   @override
-  Future<void> set<T>(String key, T value) => throw UnimplementedError();
+  Future<void> set<T>(String key, T value) async =>
+      await getInstanceByKey(key).set(key, value);
 }
diff --git a/lib/features/storage/index.dart b/lib/features/storage/index.dart
index 8ce9944e..07a79a2a 100644
--- a/lib/features/storage/index.dart
+++ b/lib/features/storage/index.dart
@@ -3,3 +3,4 @@ export 'enums/index.dart';
 export 'helpers/index.dart';
 export 'repositories/index.dart';
 export 'services/index.dart';
+export 'constants/index.dart';
diff --git a/lib/features/storage/repositories/storage_repository_impl.dart b/lib/features/storage/repositories/storage_repository_impl.dart
index 56dc470c..30f3fd0d 100644
--- a/lib/features/storage/repositories/storage_repository_impl.dart
+++ b/lib/features/storage/repositories/storage_repository_impl.dart
@@ -20,7 +20,7 @@ class StorageHelper implements StorageRepository {
   Future<void> init() async {
     await SecureStorage.instance.init();
     await SharedPreferencesStorage.instance.init();
-    await ProfileLocalDataSourceImpl.instance.init();
+    await DatabaseStorage.instance.init();
 
     String? isFirstRun = await SharedPreferencesStorage.instance
         .get(SharedPreferencesKey.isFirstRun.value);
@@ -45,7 +45,10 @@ class StorageHelper implements StorageRepository {
   }
 
   static BaseStorage getInstanceByKey(String key) {
-    if (SecureStorageKey.values.map((e) => e.value).toList().contains(key)) {
+    if (SecureStorageKey.values //
+        .map((e) => e.value)
+        .toList()
+        .contains(key)) {
       return SecureStorage.instance;
     } else if (SharedPreferencesKey.values
         .map((e) => e.value)
diff --git a/lib/features/storage/services/database_storage_service.dart b/lib/features/storage/services/database_storage_service.dart
index 832d2be4..8f90ad3e 100644
--- a/lib/features/storage/services/database_storage_service.dart
+++ b/lib/features/storage/services/database_storage_service.dart
@@ -1,11 +1,12 @@
-import 'package:hub/features/modules/index.dart';
+import 'package:hub/features/module/index.dart';
+import 'package:hub/features/storage/index.dart';
 import 'package:hub/shared/constants/index.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
 
 class DatabaseService {
   static const String _dbName = 'database.db';
-  static const int _dbVersion = 2;
+  static const int _dbVersion = 3;
 
   static final DatabaseService instance = DatabaseService._internal();
   factory DatabaseService() => instance;
@@ -48,14 +49,21 @@ class DatabaseService {
 
   Future<void> _onCreate(Database database, int version) async {
     print('Creating database...');
-    await _createTables(database, version);
+    await database.execute(createKeychainTable);
+    _onUpgrade(database, 1, _dbVersion);
   }
 
   Future<void> _onUpgrade(
       Database database, int oldVersion, int newVersion) async {
     print('Upgrading database from version $oldVersion to $newVersion...');
     if (oldVersion < 2 && newVersion >= 2) {
-      await _createTables(database, newVersion);
+      await database.execute(LicenseConstants.updatePetsHistoryTrigger);
+      await database.execute(LicenseConstants.updateDisplayTrigger);
+      await database.execute(LicenseConstants.insertDisplayTrigger);
+      await database.execute(LicenseConstants.updatePeopleDisplayTrigger);
+    }
+    if (oldVersion < 3 && newVersion >= 3) {
+      await database.execute(LocalsConstants.createLocalsTable);
     }
   }
 
@@ -63,7 +71,14 @@ class DatabaseService {
       Database database, int oldVersion, int newVersion) async {
     print('Downgrading database from version $oldVersion to $newVersion...');
     if (oldVersion >= 2 && newVersion < 2) {
-      await _dropTables(database);
+      await database.execute(LicenseConstants.deleteLicenseTable);
+      await database.execute(LicenseConstants.dropPeopleDisplayTrigger);
+      await database.execute(LicenseConstants.dropInsertDisplayTrigger);
+      await database.execute(LicenseConstants.dropUpdateDisplayTrigger);
+      await database.execute(LicenseConstants.dropPetsHistoryTrigger);
+    }
+    if (oldVersion >= 3 && newVersion > 3) {
+      await database.execute(LocalsConstants.deleteLocalsTable);
     }
   }
 
@@ -73,23 +88,4 @@ class DatabaseService {
     // await database.execute('PRAGMA temp_store = MEMORY;');
     // await database.execute('PRAGMA foreign_keys = ON;');
   }
-
-  Future<void> _createTables(Database database, int version) async {
-    await database.execute(createKeychainTable);
-    await database.execute(LicenseConstants.createLicenseTable);
-    if (version >= 2) {
-      await database.execute(LicenseConstants.updatePetsHistoryTrigger);
-      await database.execute(LicenseConstants.updateDisplayTrigger);
-      await database.execute(LicenseConstants.insertDisplayTrigger);
-      await database.execute(LicenseConstants.updatePeopleDisplayTrigger);
-    }
-  }
-
-  Future<void> _dropTables(Database database) async {
-    await database.execute(LicenseConstants.deleteLicenseTable);
-    await database.execute(LicenseConstants.dropPeopleDisplayTrigger);
-    await database.execute(LicenseConstants.dropInsertDisplayTrigger);
-    await database.execute(LicenseConstants.dropUpdateDisplayTrigger);
-    await database.execute(LicenseConstants.dropPetsHistoryTrigger);
-  }
 }
diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart
index 3178c5fd..007b1dda 100644
--- a/lib/flutter_flow/nav/nav.dart
+++ b/lib/flutter_flow/nav/nav.dart
@@ -6,7 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hub/features/backend/index.dart';
 import 'package:hub/features/history/index.dart';
 import 'package:hub/features/home/index.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 import 'package:hub/features/menu/index.dart';
 import 'package:hub/features/property/index.dart';
 import 'package:hub/features/storage/index.dart';
diff --git a/lib/initialization.dart b/lib/initialization.dart
index cdc93bc0..27bdc509 100644
--- a/lib/initialization.dart
+++ b/lib/initialization.dart
@@ -7,13 +7,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
-import 'package:hub/features/notifications/index.dart';
+import 'package:hub/features/notification/index.dart';
+import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
 
-import 'features/storage/index.dart';
-
 Future<void> initializeApp() async {
   WidgetsFlutterBinding.ensureInitialized();
   await _initializeTracking();
diff --git a/lib/main.dart b/lib/main.dart
index f2565331..9f360bda 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,7 +6,8 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:hub/features/notifications/index.dart';
+import 'package:hub/features/notification/index.dart';
+import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/internationalization.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
@@ -14,7 +15,6 @@ import 'package:hub/flutter_flow/nav/nav.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import 'features/storage/index.dart';
 import 'initialization.dart';
 
 final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
diff --git a/lib/pages/forgot_password_page/forgot_password_screen.dart b/lib/pages/forgot_password_page/forgot_password_screen.dart
index 617b46d3..bf737647 100644
--- a/lib/pages/forgot_password_page/forgot_password_screen.dart
+++ b/lib/pages/forgot_password_page/forgot_password_screen.dart
@@ -2,7 +2,7 @@ import 'package:easy_debounce/easy_debounce.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
 
diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart
index b59a975a..c8473787 100644
--- a/lib/pages/pets_page/pets_page_model.dart
+++ b/lib/pages/pets_page/pets_page_model.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:hub/components/templates_components/details_component/details_component_widget.dart';
 import 'package:hub/features/backend/index.dart';
-import 'package:hub/features/storage/data/index.dart';
+import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
 import 'package:hub/flutter_flow/flutter_flow_widgets.dart';
diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart
index c99d439f..2f1c903f 100644
--- a/lib/pages/preferences_settings_page/preferences_settings_model.dart
+++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart
@@ -2,12 +2,12 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:hub/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/backend/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 import 'package:hub/shared/utils/path_util.dart';
 import 'package:share_plus/share_plus.dart';
diff --git a/lib/pages/reception_page/reception_page_widget.dart b/lib/pages/reception_page/reception_page_widget.dart
index 7a6d41d7..e7d5718e 100644
--- a/lib/pages/reception_page/reception_page_widget.dart
+++ b/lib/pages/reception_page/reception_page_widget.dart
@@ -5,15 +5,15 @@ import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 import 'package:hub/components/atomic_components/shared_components_atoms/atom_image_svg_theme.dart';
-import 'package:hub/features/authentication/index.dart';
+import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/backend/index.dart';
-import 'package:hub/features/notifications/index.dart';
+import 'package:hub/features/notification/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_theme.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
 import 'package:hub/flutter_flow/flutter_flow_widgets.dart';
 import 'package:hub/pages/reception_page/reception_page_model.dart';
-import 'package:hub/features/locals/index.dart';
+import 'package:hub/features/local/index.dart';
 
 import 'package:hub/shared/utils/limited_text_size.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/shared/constants/index.dart b/lib/shared/constants/index.dart
index a810e4ce..e69de29b 100644
--- a/lib/shared/constants/index.dart
+++ b/lib/shared/constants/index.dart
@@ -1 +0,0 @@
-export 'keychain_constants.dart';