diff --git a/docs/meta-arch.md b/docs/meta-arch.md
index ca7a133..eb1710c 100644
--- a/docs/meta-arch.md
+++ b/docs/meta-arch.md
@@ -1,6 +1,9 @@
 # meta archietecture
 
 * [MVVM](https://docs.flutter.dev/app-architecture/guide)
+  * [Data layer](https://docs.flutter.dev/app-architecture/case-study/data-layer)
+    * View ⇆ ViewModel ⇆ Repository ⇆ Service
+      * Model is used across.
 
 ## Package structure
 
@@ -11,6 +14,9 @@ The repo structure follows official [Package structure](https://docs.flutter.dev
 * `test/widget/` contains UI widget(component) tests which focus on `View` from MVVM of each component.
 * `integration_test/` for integration tests. They should be volatile to follow UI layout changes.
 
+Some rule of thumb:
+* `<object>Provider` only placed at `/lib/data/repositories/` or `/lib/data/services/` to provide data source.
+
 ## Abstraction
 
 ### terminology
diff --git a/integration_test/export_flow_test.dart b/integration_test/export_flow_test.dart
index 04113f5..7266e05 100644
--- a/integration_test/export_flow_test.dart
+++ b/integration_test/export_flow_test.dart
@@ -7,9 +7,9 @@ import 'package:image/image.dart' as img;
 
 import 'package:pdf_signature/data/services/export_service.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
diff --git a/lib/app.dart b/lib/app.dart
index 28538bf..efa6fd4 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/ui/features/welcome/widgets/welcome_screen.dart';
 import 'data/services/preferences_providers.dart';
 import 'package:pdf_signature/ui/features/preferences/widgets/settings_screen.dart';
diff --git a/lib/ui/features/pdf/view_model/pdf_controller.dart b/lib/data/repositories/pdf_repository.dart
similarity index 100%
rename from lib/ui/features/pdf/view_model/pdf_controller.dart
rename to lib/data/repositories/pdf_repository.dart
diff --git a/lib/ui/features/signature/view_model/signature_library.dart b/lib/data/repositories/signature_library_repository.dart
similarity index 100%
rename from lib/ui/features/signature/view_model/signature_library.dart
rename to lib/data/repositories/signature_library_repository.dart
diff --git a/lib/ui/features/signature/view_model/signature_controller.dart b/lib/data/repositories/signature_repository.dart
similarity index 99%
rename from lib/ui/features/signature/view_model/signature_controller.dart
rename to lib/data/repositories/signature_repository.dart
index bda4b35..e743202 100644
--- a/lib/ui/features/signature/view_model/signature_controller.dart
+++ b/lib/data/repositories/signature_repository.dart
@@ -7,7 +7,7 @@ import 'package:image/image.dart' as img;
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/model/model.dart';
-import '../../pdf/view_model/pdf_controller.dart';
+import 'pdf_repository.dart';
 
 class SignatureController extends StateNotifier<SignatureState> {
   SignatureController() : super(SignatureState.initial());
diff --git a/lib/ui/features/pdf/widgets/adjustments_panel.dart b/lib/ui/features/pdf/widgets/adjustments_panel.dart
index 83de25c..02426c0 100644
--- a/lib/ui/features/pdf/widgets/adjustments_panel.dart
+++ b/lib/ui/features/pdf/widgets/adjustments_panel.dart
@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/model/model.dart';
-import '../../signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 
 class AdjustmentsPanel extends ConsumerWidget {
   const AdjustmentsPanel({super.key, required this.sig});
diff --git a/lib/ui/features/pdf/widgets/image_editor_dialog.dart b/lib/ui/features/pdf/widgets/image_editor_dialog.dart
index 788fe85..8889a65 100644
--- a/lib/ui/features/pdf/widgets/image_editor_dialog.dart
+++ b/lib/ui/features/pdf/widgets/image_editor_dialog.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
-import '../../signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import 'adjustments_panel.dart';
 import '../../signature/widgets/rotated_signature_image.dart';
 
diff --git a/lib/ui/features/pdf/widgets/pdf_page_area.dart b/lib/ui/features/pdf/widgets/pdf_page_area.dart
index f822cde..0a97ed1 100644
--- a/lib/ui/features/pdf/widgets/pdf_page_area.dart
+++ b/lib/ui/features/pdf/widgets/pdf_page_area.dart
@@ -4,8 +4,8 @@ import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdfrx/pdfrx.dart';
 
 import '../../../../data/services/export_providers.dart';
-import '../../signature/view_model/signature_controller.dart';
-import '../view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '../../signature/widgets/signature_drag_data.dart';
 import 'pdf_mock_continuous_list.dart';
 import 'pdf_page_overlays.dart';
diff --git a/lib/ui/features/pdf/widgets/pdf_page_overlays.dart b/lib/ui/features/pdf/widgets/pdf_page_overlays.dart
index c68e188..c99cd1b 100644
--- a/lib/ui/features/pdf/widgets/pdf_page_overlays.dart
+++ b/lib/ui/features/pdf/widgets/pdf_page_overlays.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '../../../../data/model/model.dart';
-import '../view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'signature_overlay.dart';
 
 /// Builds all overlays for a given page: placed signatures and the active one.
diff --git a/lib/ui/features/pdf/widgets/pdf_pages_overview.dart b/lib/ui/features/pdf/widgets/pdf_pages_overview.dart
index 5c18925..0ddd2f3 100644
--- a/lib/ui/features/pdf/widgets/pdf_pages_overview.dart
+++ b/lib/ui/features/pdf/widgets/pdf_pages_overview.dart
@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdfrx/pdfrx.dart';
 
 import '../../../../data/services/export_providers.dart';
-import '../view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 
 class PdfPagesOverview extends ConsumerWidget {
   const PdfPagesOverview({super.key});
diff --git a/lib/ui/features/pdf/widgets/pdf_screen.dart b/lib/ui/features/pdf/widgets/pdf_screen.dart
index 2e62436..e428159 100644
--- a/lib/ui/features/pdf/widgets/pdf_screen.dart
+++ b/lib/ui/features/pdf/widgets/pdf_screen.dart
@@ -10,9 +10,9 @@ import 'package:multi_split_view/multi_split_view.dart';
 
 import '../../../../data/services/export_providers.dart';
 import 'package:image/image.dart' as img;
-import '../../signature/view_model/signature_controller.dart';
-import '../view_model/pdf_controller.dart';
-import '../../signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'draw_canvas.dart';
 import 'pdf_toolbar.dart';
 import 'pdf_page_area.dart';
diff --git a/lib/ui/features/pdf/widgets/pdf_toolbar.dart b/lib/ui/features/pdf/widgets/pdf_toolbar.dart
index 03ac1b5..f8bb7af 100644
--- a/lib/ui/features/pdf/widgets/pdf_toolbar.dart
+++ b/lib/ui/features/pdf/widgets/pdf_toolbar.dart
@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
-import '../view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 
 class PdfToolbar extends ConsumerStatefulWidget {
   const PdfToolbar({
diff --git a/lib/ui/features/pdf/widgets/signature_drawer.dart b/lib/ui/features/pdf/widgets/signature_drawer.dart
index e833902..9c5d19b 100644
--- a/lib/ui/features/pdf/widgets/signature_drawer.dart
+++ b/lib/ui/features/pdf/widgets/signature_drawer.dart
@@ -5,8 +5,8 @@ import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/data/model/model.dart' as model;
 
 import '../../../../data/services/export_providers.dart';
-import '../../signature/view_model/signature_controller.dart';
-import '../../signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'image_editor_dialog.dart';
 import '../../signature/widgets/signature_card.dart';
 
diff --git a/lib/ui/features/pdf/widgets/signature_overlay.dart b/lib/ui/features/pdf/widgets/signature_overlay.dart
index f9476a8..06d2394 100644
--- a/lib/ui/features/pdf/widgets/signature_overlay.dart
+++ b/lib/ui/features/pdf/widgets/signature_overlay.dart
@@ -5,9 +5,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/model/model.dart';
-import '../../signature/view_model/signature_controller.dart';
-import '../view_model/pdf_controller.dart';
-import '../../signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'image_editor_dialog.dart';
 import '../../signature/widgets/rotated_signature_image.dart';
 
diff --git a/lib/ui/features/welcome/widgets/welcome_screen.dart b/lib/ui/features/welcome/widgets/welcome_screen.dart
index 7f50adb..0da17c4 100644
--- a/lib/ui/features/welcome/widgets/welcome_screen.dart
+++ b/lib/ui/features/welcome/widgets/welcome_screen.dart
@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
-import '../../signature/view_model/signature_controller.dart';
-import '../../pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 // Settings dialog is provided via global AppBar in MyApp
 
 // Abstraction to make drop handling testable without constructing
diff --git a/test/features/step/a_created_signature_card.dart b/test/features/step/a_created_signature_card.dart
index 3128606..bde5f49 100644
--- a/test/features/step/a_created_signature_card.dart
+++ b/test/features/step/a_created_signature_card.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_document_is_open_and_contains_at_least_one_signature_placement.dart b/test/features/step/a_document_is_open_and_contains_at_least_one_signature_placement.dart
index ed62a42..ab8d2d8 100644
--- a/test/features/step/a_document_is_open_and_contains_at_least_one_signature_placement.dart
+++ b/test/features/step/a_document_is_open_and_contains_at_least_one_signature_placement.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_document_is_open_and_contains_multiple_placed_signature_placements_across_pages.dart b/test/features/step/a_document_is_open_and_contains_multiple_placed_signature_placements_across_pages.dart
index 16ba2d6..e1342f7 100644
--- a/test/features/step/a_document_is_open_and_contains_multiple_placed_signature_placements_across_pages.dart
+++ b/test/features/step/a_document_is_open_and_contains_multiple_placed_signature_placements_across_pages.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_document_is_open_with_no_signature_placements_placed.dart b/test/features/step/a_document_is_open_with_no_signature_placements_placed.dart
index 4ef729c..ad9f196 100644
--- a/test/features/step/a_document_is_open_with_no_signature_placements_placed.dart
+++ b/test/features/step/a_document_is_open_with_no_signature_placements_placed.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: a document is open with no signature placements placed
diff --git a/test/features/step/a_document_page_is_selected_for_signing.dart b/test/features/step/a_document_page_is_selected_for_signing.dart
index 9cfdd12..88f257b 100644
--- a/test/features/step/a_document_page_is_selected_for_signing.dart
+++ b/test/features/step/a_document_page_is_selected_for_signing.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: a document page is selected for signing
diff --git a/test/features/step/a_drawn_signature_exists_in_the_canvas.dart b/test/features/step/a_drawn_signature_exists_in_the_canvas.dart
index a30148b..a5873be 100644
--- a/test/features/step/a_drawn_signature_exists_in_the_canvas.dart
+++ b/test/features/step/a_drawn_signature_exists_in_the_canvas.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: a drawn signature exists in the canvas
diff --git a/test/features/step/a_multipage_document_is_open.dart b/test/features/step/a_multipage_document_is_open.dart
index 01e9b49..d7451c8 100644
--- a/test/features/step/a_multipage_document_is_open.dart
+++ b/test/features/step/a_multipage_document_is_open.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_sample_multipage_document5_pages_is_available.dart b/test/features/step/a_sample_multipage_document5_pages_is_available.dart
index 3c40522..219627f 100644
--- a/test/features/step/a_sample_multipage_document5_pages_is_available.dart
+++ b/test/features/step/a_sample_multipage_document5_pages_is_available.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: a sample multi-page document (5 pages) is available
diff --git a/test/features/step/a_signature_asset_is_created.dart b/test/features/step/a_signature_asset_is_created.dart
index 097f34c..779d7ca 100644
--- a/test/features/step/a_signature_asset_is_created.dart
+++ b/test/features/step/a_signature_asset_is_created.dart
@@ -2,8 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_signature_asset_is_loaded_or_drawn.dart b/test/features/step/a_signature_asset_is_loaded_or_drawn.dart
index 1f8c9a8..54d8617 100644
--- a/test/features/step/a_signature_asset_is_loaded_or_drawn.dart
+++ b/test/features/step/a_signature_asset_is_loaded_or_drawn.dart
@@ -1,9 +1,9 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_signature_asset_is_placed_on_the_page.dart b/test/features/step/a_signature_asset_is_placed_on_the_page.dart
index 792c9bc..b51458c 100644
--- a/test/features/step/a_signature_asset_is_placed_on_the_page.dart
+++ b/test/features/step/a_signature_asset_is_placed_on_the_page.dart
@@ -2,8 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_signature_asset_is_selected.dart b/test/features/step/a_signature_asset_is_selected.dart
index dfa9d09..2806cf2 100644
--- a/test/features/step/a_signature_asset_is_selected.dart
+++ b/test/features/step/a_signature_asset_is_selected.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_signature_asset_loaded_or_drawn_is_wrapped_in_a_signature_card.dart b/test/features/step/a_signature_asset_loaded_or_drawn_is_wrapped_in_a_signature_card.dart
index b236d54..1432152 100644
--- a/test/features/step/a_signature_asset_loaded_or_drawn_is_wrapped_in_a_signature_card.dart
+++ b/test/features/step/a_signature_asset_loaded_or_drawn_is_wrapped_in_a_signature_card.dart
@@ -1,9 +1,9 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_signature_placement_appears_on_the_page_based_on_the_signature_card.dart b/test/features/step/a_signature_placement_appears_on_the_page_based_on_the_signature_card.dart
index e006467..edce35a 100644
--- a/test/features/step/a_signature_placement_appears_on_the_page_based_on_the_signature_card.dart
+++ b/test/features/step/a_signature_placement_appears_on_the_page_based_on_the_signature_card.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: a signature placement appears on the page based on the signature card
diff --git a/test/features/step/a_signature_placement_is_placed_on_page.dart b/test/features/step/a_signature_placement_is_placed_on_page.dart
index 4d09179..c5ccad9 100644
--- a/test/features/step/a_signature_placement_is_placed_on_page.dart
+++ b/test/features/step/a_signature_placement_is_placed_on_page.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/a_signature_placement_is_placed_with_a_position_and_size_relative_to_the_page.dart b/test/features/step/a_signature_placement_is_placed_with_a_position_and_size_relative_to_the_page.dart
index b11a101..0c7126c 100644
--- a/test/features/step/a_signature_placement_is_placed_with_a_position_and_size_relative_to_the_page.dart
+++ b/test/features/step/a_signature_placement_is_placed_with_a_position_and_size_relative_to_the_page.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/adjusting_one_instance_does_not_affect_the_others.dart b/test/features/step/adjusting_one_instance_does_not_affect_the_others.dart
index 156ec2b..df373ee 100644
--- a/test/features/step/adjusting_one_instance_does_not_affect_the_others.dart
+++ b/test/features/step/adjusting_one_instance_does_not_affect_the_others.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/adjusting_one_of_the_signature_placements_does_not_affect_the_others.dart b/test/features/step/adjusting_one_of_the_signature_placements_does_not_affect_the_others.dart
index 326fbc5..1f7c3be 100644
--- a/test/features/step/adjusting_one_of_the_signature_placements_does_not_affect_the_others.dart
+++ b/test/features/step/adjusting_one_of_the_signature_placements_does_not_affect_the_others.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: adjusting one of the signature placements does not affect the others
diff --git a/test/features/step/all_placed_signature_placements_appear_on_their_corresponding_pages_in_the_output.dart b/test/features/step/all_placed_signature_placements_appear_on_their_corresponding_pages_in_the_output.dart
index 69723f3..1d4f6f2 100644
--- a/test/features/step/all_placed_signature_placements_appear_on_their_corresponding_pages_in_the_output.dart
+++ b/test/features/step/all_placed_signature_placements_appear_on_their_corresponding_pages_in_the_output.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: all placed signature placements appear on their corresponding pages in the output
diff --git a/test/features/step/an_empty_signature_canvas.dart b/test/features/step/an_empty_signature_canvas.dart
index 1f330ef..c92a7c3 100644
--- a/test/features/step/an_empty_signature_canvas.dart
+++ b/test/features/step/an_empty_signature_canvas.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: an empty signature canvas
diff --git a/test/features/step/both_signature_placements_are_shown_on_their_respective_pages.dart b/test/features/step/both_signature_placements_are_shown_on_their_respective_pages.dart
index 9ed59e5..2c36541 100644
--- a/test/features/step/both_signature_placements_are_shown_on_their_respective_pages.dart
+++ b/test/features/step/both_signature_placements_are_shown_on_their_respective_pages.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: both signature placements are shown on their respective pages
diff --git a/test/features/step/dragging_or_resizing_one_does_not_change_the_other.dart b/test/features/step/dragging_or_resizing_one_does_not_change_the_other.dart
index e388baa..eb52f9a 100644
--- a/test/features/step/dragging_or_resizing_one_does_not_change_the_other.dart
+++ b/test/features/step/dragging_or_resizing_one_does_not_change_the_other.dart
@@ -1,7 +1,7 @@
 import 'dart:ui';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/each_signature_placement_can_be_dragged_and_resized_independently.dart b/test/features/step/each_signature_placement_can_be_dragged_and_resized_independently.dart
index 4eab42c..d2197cd 100644
--- a/test/features/step/each_signature_placement_can_be_dragged_and_resized_independently.dart
+++ b/test/features/step/each_signature_placement_can_be_dragged_and_resized_independently.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: each signature placement can be dragged and resized independently
diff --git a/test/features/step/identical_signature_instances_appear_in_each_location.dart b/test/features/step/identical_signature_instances_appear_in_each_location.dart
index 9d36530..8c9e6e3 100644
--- a/test/features/step/identical_signature_instances_appear_in_each_location.dart
+++ b/test/features/step/identical_signature_instances_appear_in_each_location.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: identical signature instances appear in each location
diff --git a/test/features/step/identical_signature_placements_appear_in_each_location.dart b/test/features/step/identical_signature_placements_appear_in_each_location.dart
index bc511b5..52068ae 100644
--- a/test/features/step/identical_signature_placements_appear_in_each_location.dart
+++ b/test/features/step/identical_signature_placements_appear_in_each_location.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: identical signature placements appear in each location
diff --git a/test/features/step/multiple_strokes_were_drawn.dart b/test/features/step/multiple_strokes_were_drawn.dart
index 5dfdfe6..255720a 100644
--- a/test/features/step/multiple_strokes_were_drawn.dart
+++ b/test/features/step/multiple_strokes_were_drawn.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: multiple strokes were drawn
diff --git a/test/features/step/nearwhite_background_becomes_transparent_in_the_preview.dart b/test/features/step/nearwhite_background_becomes_transparent_in_the_preview.dart
index c14aaa6..2d0cb1c 100644
--- a/test/features/step/nearwhite_background_becomes_transparent_in_the_preview.dart
+++ b/test/features/step/nearwhite_background_becomes_transparent_in_the_preview.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image/image.dart' as img;
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: near-white background becomes transparent in the preview
diff --git a/test/features/step/only_the_selected_signature_placement_is_removed.dart b/test/features/step/only_the_selected_signature_placement_is_removed.dart
index 9432ff8..1d2e8fe 100644
--- a/test/features/step/only_the_selected_signature_placement_is_removed.dart
+++ b/test/features/step/only_the_selected_signature_placement_is_removed.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: only the selected signature placement is removed
diff --git a/test/features/step/page_becomes_visible_in_the_scroll_area.dart b/test/features/step/page_becomes_visible_in_the_scroll_area.dart
index 9ef2a9e..25bcbfa 100644
--- a/test/features/step/page_becomes_visible_in_the_scroll_area.dart
+++ b/test/features/step/page_becomes_visible_in_the_scroll_area.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: page {5} becomes visible in the scroll area
diff --git a/test/features/step/page_is_displayed.dart b/test/features/step/page_is_displayed.dart
index ee761c5..5591083 100644
--- a/test/features/step/page_is_displayed.dart
+++ b/test/features/step/page_is_displayed.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: page {1} is displayed
diff --git a/test/features/step/resize_to_fit_within_bounding_box.dart b/test/features/step/resize_to_fit_within_bounding_box.dart
index 5f10e95..f2c6c35 100644
--- a/test/features/step/resize_to_fit_within_bounding_box.dart
+++ b/test/features/step/resize_to_fit_within_bounding_box.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: resize to fit within bounding box
diff --git a/test/features/step/signature_placement_occurs_on_the_selected_page.dart b/test/features/step/signature_placement_occurs_on_the_selected_page.dart
index c42e8f5..0af29f8 100644
--- a/test/features/step/signature_placement_occurs_on_the_selected_page.dart
+++ b/test/features/step/signature_placement_occurs_on_the_selected_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: signature placement occurs on the selected page
diff --git a/test/features/step/the_app_attempts_to_load_the_asset.dart b/test/features/step/the_app_attempts_to_load_the_asset.dart
index 6864e59..66c1f24 100644
--- a/test/features/step/the_app_attempts_to_load_the_asset.dart
+++ b/test/features/step/the_app_attempts_to_load_the_asset.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import '_world.dart';
 
 /// Usage: the app attempts to load the asset
diff --git a/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_asset.dart b/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_asset.dart
index 69b6066..c096f35 100644
--- a/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_asset.dart
+++ b/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_asset.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import '_world.dart';
 
 /// Usage: the asset is loaded and shown as a signature asset
diff --git a/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_card.dart b/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_card.dart
index 4e815e1..ca8f107 100644
--- a/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_card.dart
+++ b/test/features/step/the_asset_is_loaded_and_shown_as_a_signature_card.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import '_world.dart';
 
 /// Usage: the asset is loaded and shown as a signature card
diff --git a/test/features/step/the_asset_is_not_added_to_the_document.dart b/test/features/step/the_asset_is_not_added_to_the_document.dart
index dd472a9..76c835f 100644
--- a/test/features/step/the_asset_is_not_added_to_the_document.dart
+++ b/test/features/step/the_asset_is_not_added_to_the_document.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import '_world.dart';
 
 /// Usage: the asset is not added to the document
diff --git a/test/features/step/the_canvas_becomes_blank.dart b/test/features/step/the_canvas_becomes_blank.dart
index 3f06264..6d0299a 100644
--- a/test/features/step/the_canvas_becomes_blank.dart
+++ b/test/features/step/the_canvas_becomes_blank.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the canvas becomes blank
diff --git a/test/features/step/the_document_is_open.dart b/test/features/step/the_document_is_open.dart
index 56b8d64..a4f7bcd 100644
--- a/test/features/step/the_document_is_open.dart
+++ b/test/features/step/the_document_is_open.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the document is open
diff --git a/test/features/step/the_first_page_is_displayed.dart b/test/features/step/the_first_page_is_displayed.dart
index 62ed800..07e2de2 100644
--- a/test/features/step/the_first_page_is_displayed.dart
+++ b/test/features/step/the_first_page_is_displayed.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the first page is displayed
diff --git a/test/features/step/the_go_to_input_cannot_be_used.dart b/test/features/step/the_go_to_input_cannot_be_used.dart
index 1f4e2e4..fac6f98 100644
--- a/test/features/step/the_go_to_input_cannot_be_used.dart
+++ b/test/features/step/the_go_to_input_cannot_be_used.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the Go to input cannot be used
diff --git a/test/features/step/the_last_page_is_displayed_page.dart b/test/features/step/the_last_page_is_displayed_page.dart
index c42b81c..3557987 100644
--- a/test/features/step/the_last_page_is_displayed_page.dart
+++ b/test/features/step/the_last_page_is_displayed_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the last page is displayed (page {5})
diff --git a/test/features/step/the_last_stroke_is_removed.dart b/test/features/step/the_last_stroke_is_removed.dart
index d9a54d8..8d86f09 100644
--- a/test/features/step/the_last_stroke_is_removed.dart
+++ b/test/features/step/the_last_stroke_is_removed.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the last stroke is removed
diff --git a/test/features/step/the_left_pages_overview_highlights_page.dart b/test/features/step/the_left_pages_overview_highlights_page.dart
index 67ec91e..48f0b46 100644
--- a/test/features/step/the_left_pages_overview_highlights_page.dart
+++ b/test/features/step/the_left_pages_overview_highlights_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the left pages overview highlights page {5}
diff --git a/test/features/step/the_other_signature_placements_remain_unchanged.dart b/test/features/step/the_other_signature_placements_remain_unchanged.dart
index f2c0bb7..5a19111 100644
--- a/test/features/step/the_other_signature_placements_remain_unchanged.dart
+++ b/test/features/step/the_other_signature_placements_remain_unchanged.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the other signature placements remain unchanged
diff --git a/test/features/step/the_page_label_shows_page_of.dart b/test/features/step/the_page_label_shows_page_of.dart
index 13ac12f..e6bcb9d 100644
--- a/test/features/step/the_page_label_shows_page_of.dart
+++ b/test/features/step/the_page_label_shows_page_of.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the page label shows "Page {5} of {5}"
diff --git a/test/features/step/the_preview_updates_immediately.dart b/test/features/step/the_preview_updates_immediately.dart
index 4602ea2..586646c 100644
--- a/test/features/step/the_preview_updates_immediately.dart
+++ b/test/features/step/the_preview_updates_immediately.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the preview updates immediately
diff --git a/test/features/step/the_signature_placement_is_stamped_at_the_exact_pdf_page_coordinates_and_size.dart b/test/features/step/the_signature_placement_is_stamped_at_the_exact_pdf_page_coordinates_and_size.dart
index a8e1ff1..0eb2634 100644
--- a/test/features/step/the_signature_placement_is_stamped_at_the_exact_pdf_page_coordinates_and_size.dart
+++ b/test/features/step/the_signature_placement_is_stamped_at_the_exact_pdf_page_coordinates_and_size.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the signature placement is stamped at the exact PDF page coordinates and size
diff --git a/test/features/step/the_signature_placement_on_page_is_shown_on_page.dart b/test/features/step/the_signature_placement_on_page_is_shown_on_page.dart
index c370125..0c91f51 100644
--- a/test/features/step/the_signature_placement_on_page_is_shown_on_page.dart
+++ b/test/features/step/the_signature_placement_on_page_is_shown_on_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the signature placement on page {5} is shown on page {5}
diff --git a/test/features/step/the_signature_placement_on_page_remains.dart b/test/features/step/the_signature_placement_on_page_remains.dart
index aab1e08..dd6e199 100644
--- a/test/features/step/the_signature_placement_on_page_remains.dart
+++ b/test/features/step/the_signature_placement_on_page_remains.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the signature placement on page {2} remains
diff --git a/test/features/step/the_signature_placement_remains_within_the_page_area.dart b/test/features/step/the_signature_placement_remains_within_the_page_area.dart
index e9b4f39..cafed7c 100644
--- a/test/features/step/the_signature_placement_remains_within_the_page_area.dart
+++ b/test/features/step/the_signature_placement_remains_within_the_page_area.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the signature placement remains within the page area
diff --git a/test/features/step/the_signature_placement_rotates_around_its_center_in_real_time.dart b/test/features/step/the_signature_placement_rotates_around_its_center_in_real_time.dart
index 9f700b1..0b2391a 100644
--- a/test/features/step/the_signature_placement_rotates_around_its_center_in_real_time.dart
+++ b/test/features/step/the_signature_placement_rotates_around_its_center_in_real_time.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the signature placement rotates around its center in real time
diff --git a/test/features/step/the_signature_placements_appear_on_the_corresponding_page_in_the_output.dart b/test/features/step/the_signature_placements_appear_on_the_corresponding_page_in_the_output.dart
index b749b89..e3cd09a 100644
--- a/test/features/step/the_signature_placements_appear_on_the_corresponding_page_in_the_output.dart
+++ b/test/features/step/the_signature_placements_appear_on_the_corresponding_page_in_the_output.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the signature placements appear on the corresponding page in the output
diff --git a/test/features/step/the_size_and_position_update_in_real_time.dart b/test/features/step/the_size_and_position_update_in_real_time.dart
index 002231c..273e124 100644
--- a/test/features/step/the_size_and_position_update_in_real_time.dart
+++ b/test/features/step/the_size_and_position_update_in_real_time.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the size and position update in real time
diff --git a/test/features/step/the_user_attempts_to_save.dart b/test/features/step/the_user_attempts_to_save.dart
index 998049e..955ab74 100644
--- a/test/features/step/the_user_attempts_to_save.dart
+++ b/test/features/step/the_user_attempts_to_save.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user attempts to save
diff --git a/test/features/step/the_user_can_apply_or_reset_adjustments.dart b/test/features/step/the_user_can_apply_or_reset_adjustments.dart
index 4729c38..a975a9f 100644
--- a/test/features/step/the_user_can_apply_or_reset_adjustments.dart
+++ b/test/features/step/the_user_can_apply_or_reset_adjustments.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user can apply or reset adjustments
diff --git a/test/features/step/the_user_can_move_to_the_next_or_previous_page.dart b/test/features/step/the_user_can_move_to_the_next_or_previous_page.dart
index 70c127d..06cdd2e 100644
--- a/test/features/step/the_user_can_move_to_the_next_or_previous_page.dart
+++ b/test/features/step/the_user_can_move_to_the_next_or_previous_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user can move to the next or previous page
diff --git a/test/features/step/the_user_changes_contrast_and_brightness_controls.dart b/test/features/step/the_user_changes_contrast_and_brightness_controls.dart
index 9b06869..2f93c19 100644
--- a/test/features/step/the_user_changes_contrast_and_brightness_controls.dart
+++ b/test/features/step/the_user_changes_contrast_and_brightness_controls.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user changes contrast and brightness controls
diff --git a/test/features/step/the_user_chooses_a_image_file_as_a_signature_asset.dart b/test/features/step/the_user_chooses_a_image_file_as_a_signature_asset.dart
index b7476ee..51f51a8 100644
--- a/test/features/step/the_user_chooses_a_image_file_as_a_signature_asset.dart
+++ b/test/features/step/the_user_chooses_a_image_file_as_a_signature_asset.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import '_world.dart';
 
 /// Usage: the user chooses a image file as a signature asset
diff --git a/test/features/step/the_user_chooses_a_signature_asset_to_created_a_signature_card.dart b/test/features/step/the_user_chooses_a_signature_asset_to_created_a_signature_card.dart
index 504e8ca..91cbc46 100644
--- a/test/features/step/the_user_chooses_a_signature_asset_to_created_a_signature_card.dart
+++ b/test/features/step/the_user_chooses_a_signature_asset_to_created_a_signature_card.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import '_world.dart';
 
 /// Usage: the user chooses a signature asset to created a signature card
diff --git a/test/features/step/the_user_chooses_undo.dart b/test/features/step/the_user_chooses_undo.dart
index 01ee419..7a40a01 100644
--- a/test/features/step/the_user_chooses_undo.dart
+++ b/test/features/step/the_user_chooses_undo.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user chooses undo
diff --git a/test/features/step/the_user_clears_the_canvas.dart b/test/features/step/the_user_clears_the_canvas.dart
index f48a31f..0c705a4 100644
--- a/test/features/step/the_user_clears_the_canvas.dart
+++ b/test/features/step/the_user_clears_the_canvas.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user clears the canvas
diff --git a/test/features/step/the_user_clicks_the_go_to_apply_button.dart b/test/features/step/the_user_clicks_the_go_to_apply_button.dart
index bd28d4d..66b4731 100644
--- a/test/features/step/the_user_clicks_the_go_to_apply_button.dart
+++ b/test/features/step/the_user_clicks_the_go_to_apply_button.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user clicks the Go to apply button
diff --git a/test/features/step/the_user_clicks_the_thumbnail_for_page.dart b/test/features/step/the_user_clicks_the_thumbnail_for_page.dart
index a289ba0..b0cfb7c 100644
--- a/test/features/step/the_user_clicks_the_thumbnail_for_page.dart
+++ b/test/features/step/the_user_clicks_the_thumbnail_for_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user clicks the thumbnail for page {2}
diff --git a/test/features/step/the_user_deletes_one_selected_signature_placement.dart b/test/features/step/the_user_deletes_one_selected_signature_placement.dart
index bc5c095..e372581 100644
--- a/test/features/step/the_user_deletes_one_selected_signature_placement.dart
+++ b/test/features/step/the_user_deletes_one_selected_signature_placement.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user deletes one selected signature placement
diff --git a/test/features/step/the_user_drags_handles_to_resize_and_drags_to_reposition.dart b/test/features/step/the_user_drags_handles_to_resize_and_drags_to_reposition.dart
index 213c76b..0634c55 100644
--- a/test/features/step/the_user_drags_handles_to_resize_and_drags_to_reposition.dart
+++ b/test/features/step/the_user_drags_handles_to_resize_and_drags_to_reposition.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user drags handles to resize and drags to reposition
diff --git a/test/features/step/the_user_drags_it_on_the_page_of_the_document_to_place_signature_placements_in_multiple_locations_in_the_document.dart b/test/features/step/the_user_drags_it_on_the_page_of_the_document_to_place_signature_placements_in_multiple_locations_in_the_document.dart
index a8acc9f..e4e7502 100644
--- a/test/features/step/the_user_drags_it_on_the_page_of_the_document_to_place_signature_placements_in_multiple_locations_in_the_document.dart
+++ b/test/features/step/the_user_drags_it_on_the_page_of_the_document_to_place_signature_placements_in_multiple_locations_in_the_document.dart
@@ -2,8 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/the_user_drags_this_signature_card_on_the_page_of_the_document_to_place_a_signature_placement.dart b/test/features/step/the_user_drags_this_signature_card_on_the_page_of_the_document_to_place_a_signature_placement.dart
index c548e67..0e99dc4 100644
--- a/test/features/step/the_user_drags_this_signature_card_on_the_page_of_the_document_to_place_a_signature_placement.dart
+++ b/test/features/step/the_user_drags_this_signature_card_on_the_page_of_the_document_to_place_a_signature_placement.dart
@@ -2,8 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/the_user_draws_strokes_and_confirms.dart b/test/features/step/the_user_draws_strokes_and_confirms.dart
index 7fe3dd6..57d0d79 100644
--- a/test/features/step/the_user_draws_strokes_and_confirms.dart
+++ b/test/features/step/the_user_draws_strokes_and_confirms.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user draws strokes and confirms
diff --git a/test/features/step/the_user_enables_background_removal.dart b/test/features/step/the_user_enables_background_removal.dart
index 1f6b5e3..a80d99b 100644
--- a/test/features/step/the_user_enables_background_removal.dart
+++ b/test/features/step/the_user_enables_background_removal.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user enables background removal
diff --git a/test/features/step/the_user_enters_into_the_go_to_input_and_applies_it.dart b/test/features/step/the_user_enters_into_the_go_to_input_and_applies_it.dart
index eb78e6e..8e5c01d 100644
--- a/test/features/step/the_user_enters_into_the_go_to_input_and_applies_it.dart
+++ b/test/features/step/the_user_enters_into_the_go_to_input_and_applies_it.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user enters {99} into the Go to input and applies it
diff --git a/test/features/step/the_user_is_notified_of_the_issue.dart b/test/features/step/the_user_is_notified_of_the_issue.dart
index e38d833..b27050e 100644
--- a/test/features/step/the_user_is_notified_of_the_issue.dart
+++ b/test/features/step/the_user_is_notified_of_the_issue.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import '_world.dart';
 
 /// Usage: the user is notified of the issue
diff --git a/test/features/step/the_user_jumps_to_page.dart b/test/features/step/the_user_jumps_to_page.dart
index 733fe79..888bbf9 100644
--- a/test/features/step/the_user_jumps_to_page.dart
+++ b/test/features/step/the_user_jumps_to_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user jumps to page {2}
diff --git a/test/features/step/the_user_navigates_to_page_and_places_another_signature_placement.dart b/test/features/step/the_user_navigates_to_page_and_places_another_signature_placement.dart
index 0fff3fe..be1da73 100644
--- a/test/features/step/the_user_navigates_to_page_and_places_another_signature_placement.dart
+++ b/test/features/step/the_user_navigates_to_page_and_places_another_signature_placement.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/the_user_places_a_signature_placement_from_asset_on_page.dart b/test/features/step/the_user_places_a_signature_placement_from_asset_on_page.dart
index 9389ec7..567d4ac 100644
--- a/test/features/step/the_user_places_a_signature_placement_from_asset_on_page.dart
+++ b/test/features/step/the_user_places_a_signature_placement_from_asset_on_page.dart
@@ -2,8 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/the_user_places_a_signature_placement_on_page.dart b/test/features/step/the_user_places_a_signature_placement_on_page.dart
index 526a6e1..dd043df 100644
--- a/test/features/step/the_user_places_a_signature_placement_on_page.dart
+++ b/test/features/step/the_user_places_a_signature_placement_on_page.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/the_user_places_it_in_multiple_locations_in_the_document.dart b/test/features/step/the_user_places_it_in_multiple_locations_in_the_document.dart
index 087c030..18c028d 100644
--- a/test/features/step/the_user_places_it_in_multiple_locations_in_the_document.dart
+++ b/test/features/step/the_user_places_it_in_multiple_locations_in_the_document.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user places it in multiple locations in the document
diff --git a/test/features/step/the_user_places_two_signature_placements_on_the_same_page.dart b/test/features/step/the_user_places_two_signature_placements_on_the_same_page.dart
index 8629cef..2905802 100644
--- a/test/features/step/the_user_places_two_signature_placements_on_the_same_page.dart
+++ b/test/features/step/the_user_places_two_signature_placements_on_the_same_page.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/features/step/the_user_savesexports_the_document.dart b/test/features/step/the_user_savesexports_the_document.dart
index 6989a9f..f717666 100644
--- a/test/features/step/the_user_savesexports_the_document.dart
+++ b/test/features/step/the_user_savesexports_the_document.dart
@@ -1,8 +1,8 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user saves/exports the document
diff --git a/test/features/step/the_user_selects.dart b/test/features/step/the_user_selects.dart
index d881cf5..d2dfab2 100644
--- a/test/features/step/the_user_selects.dart
+++ b/test/features/step/the_user_selects.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user selects "<file>"
diff --git a/test/features/step/the_user_types_into_the_go_to_input_and_presses_enter.dart b/test/features/step/the_user_types_into_the_go_to_input_and_presses_enter.dart
index 51ca60b..c80e1d7 100644
--- a/test/features/step/the_user_types_into_the_go_to_input_and_presses_enter.dart
+++ b/test/features/step/the_user_types_into_the_go_to_input_and_presses_enter.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user types {3} into the Go to input and presses Enter
diff --git a/test/features/step/the_user_uses_rotate_controls.dart b/test/features/step/the_user_uses_rotate_controls.dart
index 5c87db8..74152de 100644
--- a/test/features/step/the_user_uses_rotate_controls.dart
+++ b/test/features/step/the_user_uses_rotate_controls.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import '_world.dart';
 
 /// Usage: the user uses rotate controls
diff --git a/test/features/step/three_signature_placements_are_placed_on_the_current_page.dart b/test/features/step/three_signature_placements_are_placed_on_the_current_page.dart
index 846a759..34d5034 100644
--- a/test/features/step/three_signature_placements_are_placed_on_the_current_page.dart
+++ b/test/features/step/three_signature_placements_are_placed_on_the_current_page.dart
@@ -2,9 +2,9 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import '_world.dart';
 
diff --git a/test/widget/export_flow_test.dart b/test/widget/export_flow_test.dart
index e956bc6..9327153 100644
--- a/test/widget/export_flow_test.dart
+++ b/test/widget/export_flow_test.dart
@@ -4,8 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/data/services/export_service.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
diff --git a/test/widget/helpers.dart b/test/widget/helpers.dart
index a59c0c2..1d87832 100644
--- a/test/widget/helpers.dart
+++ b/test/widget/helpers.dart
@@ -5,8 +5,8 @@ import 'package:image/image.dart' as img;
 import 'dart:typed_data';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 // preferences_providers.dart no longer exports pageViewModeProvider
diff --git a/test/widget/pdf_navigation_widget_test.dart b/test/widget/pdf_navigation_widget_test.dart
index aeeea2e..f686775 100644
--- a/test/widget/pdf_navigation_widget_test.dart
+++ b/test/widget/pdf_navigation_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
diff --git a/test/widget/pdf_page_area_early_jump_test.dart b/test/widget/pdf_page_area_early_jump_test.dart
index 08a5155..06b7f9f 100644
--- a/test/widget/pdf_page_area_early_jump_test.dart
+++ b/test/widget/pdf_page_area_early_jump_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_page_area.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/data/model/model.dart';
diff --git a/test/widget/pdf_page_area_jump_test.dart b/test/widget/pdf_page_area_jump_test.dart
index 6d67991..302bc81 100644
--- a/test/widget/pdf_page_area_jump_test.dart
+++ b/test/widget/pdf_page_area_jump_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_page_area.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/data/model/model.dart';
diff --git a/test/widget/pdf_page_area_test.dart b/test/widget/pdf_page_area_test.dart
index 6f5459e..760e92c 100644
--- a/test/widget/pdf_page_area_test.dart
+++ b/test/widget/pdf_page_area_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_page_area.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 
 void main() {
diff --git a/test/widget/regression_signature_tests.dart b/test/widget/regression_signature_tests.dart
index 1365fde..8af4574 100644
--- a/test/widget/regression_signature_tests.dart
+++ b/test/widget/regression_signature_tests.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_library.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_library_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 
 import 'helpers.dart';
diff --git a/test/widget/welcome_drop_test.dart b/test/widget/welcome_drop_test.dart
index 82bef4f..4745a67 100644
--- a/test/widget/welcome_drop_test.dart
+++ b/test/widget/welcome_drop_test.dart
@@ -6,8 +6,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/ui/features/welcome/widgets/welcome_screen.dart';
-import 'package:pdf_signature/ui/features/signature/view_model/signature_controller.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
+import 'package:pdf_signature/data/repositories/signature_repository.dart';
+import 'package:pdf_signature/data/repositories/pdf_repository.dart';
 
 class _FakeDropReadable implements DropReadable {
   final String _name;