diff --git a/lib/features/backend/api_requests/api_calls.dart b/lib/features/backend/api_requests/api_calls.dart
index 0e0a7421..192bae1a 100644
--- a/lib/features/backend/api_requests/api_calls.dart
+++ b/lib/features/backend/api_requests/api_calls.dart
@@ -11,7 +11,7 @@ import 'package:hub/features/storage/index.dart';
 
 import 'package:hub/shared/utils/log_util.dart';
 import 'package:hub/shared/utils/validator_util.dart';
-import 'package:hub/shared/widgets/widgets.dart';
+import 'package:hub/shared/widgets.dart';
 
 import '/flutter_flow/flutter_flow_util.dart';
 import 'api_manager.dart';
diff --git a/lib/features/documents/documents.dart b/lib/features/documents/documents.dart
index ba712d91..a3a9eab1 100644
--- a/lib/features/documents/documents.dart
+++ b/lib/features/documents/documents.dart
@@ -1,17 +1,15 @@
 import 'dart:developer';
-
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:flutter/material.dart';
 import 'package:hub/components/templates_components/details_component/details_component_widget.dart';
 import 'package:hub/features/backend/index.dart';
 import 'package:hub/flutter_flow/index.dart';
-import 'package:hub/shared/extensions/index.dart';
-import 'package:hub/shared/utils/index.dart';
-import 'package:hub/shared/widgets/widgets.dart';
+import 'package:hub/shared/extensions.dart';
+import 'package:hub/shared/utils.dart';
+import 'package:hub/shared/widgets.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_rx_bloc/flutter_rx_bloc.dart';
-
 import 'package:rx_bloc/rx_bloc.dart';
 import 'package:rxdart/rxdart.dart' as rx;
 
diff --git a/lib/shared/constants.dart b/lib/shared/constants.dart
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/shared/constants/index.dart b/lib/shared/constants/index.dart
deleted file mode 100644
index 8b137891..00000000
--- a/lib/shared/constants/index.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/shared/enums.dart b/lib/shared/enums.dart
new file mode 100644
index 00000000..85af0099
--- /dev/null
+++ b/lib/shared/enums.dart
@@ -0,0 +1 @@
+export 'enums/enum_throw_exception.dart';
diff --git a/lib/shared/enums/index.dart b/lib/shared/enums/index.dart
deleted file mode 100644
index 585bd715..00000000
--- a/lib/shared/enums/index.dart
+++ /dev/null
@@ -1 +0,0 @@
-export 'enum_throw_exception.dart';
diff --git a/lib/shared/extensions.dart b/lib/shared/extensions.dart
new file mode 100644
index 00000000..c07e669c
--- /dev/null
+++ b/lib/shared/extensions.dart
@@ -0,0 +1,3 @@
+export 'extensions/dialog_extensions.dart';
+export 'extensions/flutter_secure_storage_extensions.dart';
+export 'extensions/string_extensions.dart';
diff --git a/lib/shared/extensions/index.dart b/lib/shared/extensions/index.dart
deleted file mode 100644
index 0f71878e..00000000
--- a/lib/shared/extensions/index.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-export 'dialog_extensions.dart';
-export 'flutter_secure_storage_extensions.dart';
-export 'string_extensions.dart';
diff --git a/lib/shared/helpers.dart b/lib/shared/helpers.dart
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/shared/helpers/index.dart b/lib/shared/helpers/index.dart
deleted file mode 100644
index 8b137891..00000000
--- a/lib/shared/helpers/index.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/shared/index.dart b/lib/shared/index.dart
deleted file mode 100644
index 8b137891..00000000
--- a/lib/shared/index.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/shared/mixins.dart b/lib/shared/mixins.dart
new file mode 100644
index 00000000..bd86cf22
--- /dev/null
+++ b/lib/shared/mixins.dart
@@ -0,0 +1,4 @@
+export 'mixins/pegeable_mixin.dart';
+export 'mixins/status_mixin.dart';
+export 'mixins/switcher_mixin.dart';
+export 'mixins/template_mixin.dart';
diff --git a/lib/shared/mixins/index.dart b/lib/shared/mixins/index.dart
deleted file mode 100644
index 974783fd..00000000
--- a/lib/shared/mixins/index.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-export 'pegeable_mixin.dart';
-export 'status_mixin.dart';
-export 'switcher_mixin.dart';
diff --git a/lib/shared/services.dart b/lib/shared/services.dart
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/shared/services/index.dart b/lib/shared/services/index.dart
deleted file mode 100644
index 8b137891..00000000
--- a/lib/shared/services/index.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/shared/utils.dart b/lib/shared/utils.dart
new file mode 100644
index 00000000..09901b4d
--- /dev/null
+++ b/lib/shared/utils.dart
@@ -0,0 +1,14 @@
+export 'utils/biometric_util.dart';
+export 'utils/device_util.dart';
+export 'utils/dialog_util.dart';
+export 'utils/image_util.dart';
+export 'utils/limited_text_size.dart';
+export 'utils/loading_util.dart';
+export 'utils/log_util.dart';
+export 'utils/path_util.dart';
+export 'utils/share_util.dart';
+export 'utils/snackbar_util.dart';
+export 'utils/string_util.dart';
+export 'utils/text_util.dart';
+export 'utils/validator_util.dart';
+export 'utils/webview_util.dart';
diff --git a/lib/shared/utils/index.dart b/lib/shared/utils/index.dart
deleted file mode 100644
index 6d20915d..00000000
--- a/lib/shared/utils/index.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-export 'biometric_util.dart';
-export 'device_util.dart';
-export 'dialog_util.dart';
-export 'image_util.dart';
-export 'limited_text_size.dart';
-export 'loading_util.dart';
-export 'log_util.dart';
-export 'path_util.dart';
-export 'share_util.dart';
-export 'snackbar_util.dart';
-export 'string_util.dart';
-export 'text_util.dart';
-export 'validator_util.dart';
-export 'webview_util.dart';
diff --git a/lib/shared/widgets.dart b/lib/shared/widgets.dart
new file mode 100644
index 00000000..6c68e385
--- /dev/null
+++ b/lib/shared/widgets.dart
@@ -0,0 +1,16 @@
+/// [Base]
+export 'widgets/page.dart';
+export 'widgets/component.dart';
+export 'widgets/screen.dart';
+export 'widgets/model.dart';
+export 'widgets/entity.dart';
+
+/// [View]'s
+export 'widgets/list_view.dart';
+export 'widgets/read_view.dart';
+export 'widgets/enhanced_carousel_view.dart';
+export 'widgets/enhanced_list_view.dart';
+export 'widgets/enhanced_search_view.dart';
+
+/// [Component]'s
+export 'widgets/text.dart';
diff --git a/lib/shared/widgets/component.dart b/lib/shared/widgets/component.dart
index 74fc9ae1..a622f134 100644
--- a/lib/shared/widgets/component.dart
+++ b/lib/shared/widgets/component.dart
@@ -1,4 +1,5 @@
-part of 'widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:hub/shared/widgets.dart';
 
 /// [ComponentWidget]
 
diff --git a/lib/shared/widgets/enhanced_carousel_view.dart b/lib/shared/widgets/enhanced_carousel_view.dart
index 7338dfb0..c6bb4349 100644
--- a/lib/shared/widgets/enhanced_carousel_view.dart
+++ b/lib/shared/widgets/enhanced_carousel_view.dart
@@ -1,4 +1,6 @@
-part of 'widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:hub/flutter_flow/index.dart';
+import 'package:hub/shared/utils.dart';
 
 class EnhancedCarouselView<T> extends StatelessWidget {
   final Future<List<T?>> Function() dataProvider;
diff --git a/lib/shared/widgets/enhanced_list_view.dart b/lib/shared/widgets/enhanced_list_view.dart
index 75298097..a2de85e5 100644
--- a/lib/shared/widgets/enhanced_list_view.dart
+++ b/lib/shared/widgets/enhanced_list_view.dart
@@ -1,4 +1,9 @@
-part of 'widgets.dart';
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:rx_bloc/rx_bloc.dart';
+import 'package:rx_bloc_list/rx_bloc_list.dart';
+import 'package:rxdart/rxdart.dart';
 
 /// [TypeDefs] ----------------------------------------------------
 
diff --git a/lib/shared/widgets/enhanced_search_view.dart b/lib/shared/widgets/enhanced_search_view.dart
index fb18038a..d8ffda2e 100644
--- a/lib/shared/widgets/enhanced_search_view.dart
+++ b/lib/shared/widgets/enhanced_search_view.dart
@@ -1,5 +1,3 @@
-part of 'widgets.dart';
-
 // class EnhancedSearchView<QueryType> extends StatelessWidget {
 //   const EnhancedSearchView({
 //     super.key,
diff --git a/lib/shared/widgets/entity.dart b/lib/shared/widgets/entity.dart
index ae05f63f..58bcaa43 100644
--- a/lib/shared/widgets/entity.dart
+++ b/lib/shared/widgets/entity.dart
@@ -1,3 +1 @@
-part of 'widgets.dart';
-
 abstract class Entity<T> {}
diff --git a/lib/shared/widgets/list_view.dart b/lib/shared/widgets/list_view.dart
index e1074f79..04a3e12c 100644
--- a/lib/shared/widgets/list_view.dart
+++ b/lib/shared/widgets/list_view.dart
@@ -1,5 +1,3 @@
-part of 'widgets.dart';
-
 // typedef SearchKey = GlobalKey<EnhancedRemoteListViewState>;
 
 // typedef Query<X extends Archive> = X?;
diff --git a/lib/shared/widgets/model.dart b/lib/shared/widgets/model.dart
index c35a6491..0bea7b2f 100644
--- a/lib/shared/widgets/model.dart
+++ b/lib/shared/widgets/model.dart
@@ -1,4 +1,4 @@
-part of 'widgets.dart';
+import 'package:flutter/material.dart';
 
 class ModelWidget extends Widget {
   const ModelWidget({super.key});
diff --git a/lib/shared/widgets/page.dart b/lib/shared/widgets/page.dart
index 8fda7fad..492c3651 100644
--- a/lib/shared/widgets/page.dart
+++ b/lib/shared/widgets/page.dart
@@ -1,4 +1,6 @@
-part of 'widgets.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hub/shared/mixins/template_mixin.dart';
+import 'package:hub/shared/widgets.dart';
 
 /// [PageWidget]
 
diff --git a/lib/shared/widgets/read_view.dart b/lib/shared/widgets/read_view.dart
index 2e5208e0..b3e394ca 100644
--- a/lib/shared/widgets/read_view.dart
+++ b/lib/shared/widgets/read_view.dart
@@ -1,6 +1,14 @@
-part of 'widgets.dart';
+import 'dart:developer';
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:hub/features/backend/index.dart';
+import 'package:hub/flutter_flow/index.dart';
+import 'package:hub/shared/widgets.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:pdfx/pdfx.dart';
+import 'package:share_plus/share_plus.dart';
+import 'package:http/http.dart' as http;
 
-// typedef PDFViewerKey = GlobalKey<SfPdfViewerState>;
 typedef ReadViewController = PdfController;
 typedef DocumentType = PdfDocument;
 
diff --git a/lib/shared/widgets/screen.dart b/lib/shared/widgets/screen.dart
index f4dd20c8..3acf7a57 100644
--- a/lib/shared/widgets/screen.dart
+++ b/lib/shared/widgets/screen.dart
@@ -1,4 +1,6 @@
-part of 'widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:hub/shared/mixins/template_mixin.dart';
+import 'package:hub/shared/widgets.dart';
 
 abstract class ScreenWidget<T> extends Widget {
   const ScreenWidget({super.key});
diff --git a/lib/shared/widgets/text.dart b/lib/shared/widgets/text.dart
index 68b8b065..c18c2861 100644
--- a/lib/shared/widgets/text.dart
+++ b/lib/shared/widgets/text.dart
@@ -1,4 +1,4 @@
-part of 'widgets.dart';
+import 'package:auto_size_text/auto_size_text.dart';
 
 class AutoText extends AutoSizeText {
   const AutoText(
diff --git a/lib/shared/widgets/widgets.dart b/lib/shared/widgets/widgets.dart
deleted file mode 100644
index 49bad510..00000000
--- a/lib/shared/widgets/widgets.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-import 'dart:developer';
-import 'dart:io';
-
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:easy_debounce/easy_debounce.dart';
-import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-import 'package:hub/flutter_flow/index.dart';
-import 'package:hub/shared/mixins/template_mixin.dart';
-import 'package:hub/shared/utils/index.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:pdfx/pdfx.dart';
-import 'package:share_plus/share_plus.dart';
-import 'package:rx_bloc_list/rx_bloc_list.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:rx_bloc/rx_bloc.dart';
-
-part 'widgets.rxb.g.dart';
-
-/// [Base]
-part 'page.dart';
-part 'component.dart';
-part 'screen.dart';
-part 'model.dart';
-part 'entity.dart';
-
-/// [View]'s
-part 'list_view.dart';
-part 'read_view.dart';
-part 'enhanced_carousel_view.dart';
-part 'enhanced_list_view.dart';
-part 'enhanced_search_view.dart';
-
-/// [Component]'s
-part 'text.dart';
diff --git a/lib/shared/widgets/widgets.rxb.g.dart b/lib/shared/widgets/widgets.rxb.g.dart
deleted file mode 100644
index 4dd0c665..00000000
--- a/lib/shared/widgets/widgets.rxb.g.dart
+++ /dev/null
@@ -1,108 +0,0 @@
-// // dart format width=80
-// // GENERATED CODE - DO NOT MODIFY BY HAND
-
-// // **************************************************************************
-// // Generator: RxBlocGeneratorForAnnotation
-// // **************************************************************************
-
-part of 'widgets.dart';
-
-// /// Used as a contractor for the bloc, events and states classes
-// /// @nodoc
-// abstract class EnhancedListViewBlocType extends RxBlocTypeBase {
-//   EnhancedListViewEvents get events;
-//   EnhancedListViewStates get states;
-// }
-
-// /// [$EnhancedListViewBloc<BodyType, HeaderType, FooterType, QueryType>] extended by the [EnhancedListViewBloc<BodyType, HeaderType, FooterType, QueryType>]
-// /// @nodoc
-// abstract class $EnhancedListViewBloc<BodyType, HeaderType, FooterType, QueryType> extends RxBlocBase
-//     implements
-//         EnhancedListViewEvents,
-//         EnhancedListViewStates,
-//         EnhancedListViewBlocType {
-//   final _compositeSubscription = CompositeSubscription();
-
-//   /// Тhe [Subject] where events sink to by calling [loadBodyItems]
-//   final _$loadBodyItemsEvent = PublishSubject<({bool reset, dynamic query})>();
-
-//   /// Тhe [Subject] where events sink to by calling [loadHeaderItems]
-//   final _$loadHeaderItemsEvent = PublishSubject<void>();
-
-//   /// Тhe [Subject] where events sink to by calling [loadFooterItems]
-//   final _$loadFooterItemsEvent = PublishSubject<void>();
-
-//   /// The state of [bodyItems] implemented in [_mapToBodyItemsState]
-//   late final Stream<List<T>> _bodyItemsState = _mapToBodyItemsState();
-
-//   /// The state of [headerItems] implemented in [_mapToHeaderItemsState]
-//   late final Stream<List<H>> _headerItemsState = _mapToHeaderItemsState();
-
-//   /// The state of [footerItems] implemented in [_mapToFooterItemsState]
-//   late final Stream<List<F>> _footerItemsState = _mapToFooterItemsState();
-
-//   /// The state of [isLoading] implemented in [_mapToIsLoadingState]
-//   late final Stream<bool> _isLoadingState = _mapToIsLoadingState();
-
-//   /// The state of [errors] implemented in [_mapToErrorsState]
-//   late final Stream<String> _errorsState = _mapToErrorsState();
-
-//   @override
-//   void loadBodyItems({
-//     bool reset = false,
-//     dynamic query = null,
-//   }) =>
-//       _$loadBodyItemsEvent.add((
-//         reset: reset,
-//         query: query,
-//       ));
-
-//   @override
-//   void loadHeaderItems() => _$loadHeaderItemsEvent.add(null);
-
-//   @override
-//   void loadFooterItems() => _$loadFooterItemsEvent.add(null);
-
-//   @override
-//   Stream<List<T>> get bodyItems => _bodyItemsState;
-
-//   @override
-//   Stream<List<H>> get headerItems => _headerItemsState;
-
-//   @override
-//   Stream<List<F>> get footerItems => _footerItemsState;
-
-//   @override
-//   Stream<bool> get isLoading => _isLoadingState;
-
-//   @override
-//   Stream<String> get errors => _errorsState;
-
-//   Stream<List<T>> _mapToBodyItemsState();
-
-//   Stream<List<H>> _mapToHeaderItemsState();
-
-//   Stream<List<F>> _mapToFooterItemsState();
-
-//   Stream<bool> _mapToIsLoadingState();
-
-//   Stream<String> _mapToErrorsState();
-
-//   @override
-//   EnhancedListViewEvents get events => this;
-
-//   @override
-//   EnhancedListViewStates get states => this;
-
-//   @override
-//   void dispose() {
-//     _$loadBodyItemsEvent.close();
-//     _$loadHeaderItemsEvent.close();
-//     _$loadFooterItemsEvent.close();
-//     _compositeSubscription.dispose();
-//     super.dispose();
-//   }
-// }
-
-// // ignore: unused_element
-// typedef _LoadBodyItemsEventArgs = ({bool reset, dynamic query});