diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/clock_in_validator.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/clock_in_validator.dart
similarity index 81%
rename from apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/clock_in_validator.dart
rename to apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/clock_in_validator.dart
index 8b818524..62ccdc54 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/clock_in_validator.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/clock_in_validator.dart
@@ -1,5 +1,5 @@
-import 'clock_in_validation_context.dart';
-import 'clock_in_validation_result.dart';
+import '../clock_in_validation_context.dart';
+import '../clock_in_validation_result.dart';
 
 /// Abstract interface for a single step in the clock-in validation pipeline.
 ///
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/composite_clock_in_validator.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/composite_clock_in_validator.dart
similarity index 92%
rename from apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/composite_clock_in_validator.dart
rename to apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/composite_clock_in_validator.dart
index 3521ee7a..d6cd0173 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/composite_clock_in_validator.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/composite_clock_in_validator.dart
@@ -1,5 +1,5 @@
-import 'clock_in_validation_context.dart';
-import 'clock_in_validation_result.dart';
+import '../clock_in_validation_context.dart';
+import '../clock_in_validation_result.dart';
 import 'clock_in_validator.dart';
 
 /// Runs a list of [ClockInValidator]s in order, short-circuiting on first failure.
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/geofence_validator.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/geofence_validator.dart
similarity index 93%
rename from apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/geofence_validator.dart
rename to apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/geofence_validator.dart
index 1f6c3c80..cf2d8704 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/geofence_validator.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/geofence_validator.dart
@@ -1,5 +1,5 @@
-import 'clock_in_validation_context.dart';
-import 'clock_in_validation_result.dart';
+import '../clock_in_validation_context.dart';
+import '../clock_in_validation_result.dart';
 import 'clock_in_validator.dart';
 
 /// Validates that geofence requirements are satisfied before clock-in.
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/override_notes_validator.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/override_notes_validator.dart
similarity index 92%
rename from apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/override_notes_validator.dart
rename to apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/override_notes_validator.dart
index a425e53d..22eef4c0 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/override_notes_validator.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/override_notes_validator.dart
@@ -1,5 +1,5 @@
-import 'clock_in_validation_context.dart';
-import 'clock_in_validation_result.dart';
+import '../clock_in_validation_context.dart';
+import '../clock_in_validation_result.dart';
 import 'clock_in_validator.dart';
 
 /// Validates that override notes are provided when required.
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/time_window_validator.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/time_window_validator.dart
similarity index 93%
rename from apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/time_window_validator.dart
rename to apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/time_window_validator.dart
index 4fcac299..a38edd62 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/time_window_validator.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/domain/validators/validators/time_window_validator.dart
@@ -1,7 +1,7 @@
 import 'package:intl/intl.dart';
+import 'package:staff_clock_in/src/domain/validators/clock_in_validation_context.dart';
+import 'package:staff_clock_in/src/domain/validators/clock_in_validation_result.dart';
 
-import 'clock_in_validation_context.dart';
-import 'clock_in_validation_result.dart';
 import 'clock_in_validator.dart';
 
 /// Validates that the current time falls within the allowed window.
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/bloc/clock_in/clock_in_bloc.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/bloc/clock_in/clock_in_bloc.dart
index d2db4a44..748509d1 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/bloc/clock_in/clock_in_bloc.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/bloc/clock_in/clock_in_bloc.dart
@@ -10,7 +10,7 @@ import '../../../domain/usecases/get_attendance_status_usecase.dart';
 import '../../../domain/usecases/get_todays_shift_usecase.dart';
 import '../../../domain/validators/clock_in_validation_context.dart';
 import '../../../domain/validators/clock_in_validation_result.dart';
-import '../../../domain/validators/composite_clock_in_validator.dart';
+import '../../../domain/validators/validators/composite_clock_in_validator.dart';
 import '../geofence/geofence_bloc.dart';
 import '../geofence/geofence_event.dart';
 import '../geofence/geofence_state.dart';
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/widgets/clock_in_action_section.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/widgets/clock_in_action_section.dart
index c2efc4c1..99c348d1 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/widgets/clock_in_action_section.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/presentation/widgets/clock_in_action_section.dart
@@ -11,7 +11,7 @@ import '../bloc/clock_in/clock_in_event.dart';
 import '../bloc/geofence/geofence_bloc.dart';
 import '../bloc/geofence/geofence_state.dart';
 import '../../domain/validators/clock_in_validation_context.dart';
-import '../../domain/validators/time_window_validator.dart';
+import '../../domain/validators/validators/time_window_validator.dart';
 import '../strategies/check_in_interaction.dart';
 import '../strategies/nfc_check_in_interaction.dart';
 import '../strategies/swipe_check_in_interaction.dart';
diff --git a/apps/mobile/packages/features/staff/clock_in/lib/src/staff_clock_in_module.dart b/apps/mobile/packages/features/staff/clock_in/lib/src/staff_clock_in_module.dart
index 370362fc..32945ba3 100644
--- a/apps/mobile/packages/features/staff/clock_in/lib/src/staff_clock_in_module.dart
+++ b/apps/mobile/packages/features/staff/clock_in/lib/src/staff_clock_in_module.dart
@@ -12,11 +12,11 @@ import 'domain/usecases/clock_in_usecase.dart';
 import 'domain/usecases/clock_out_usecase.dart';
 import 'domain/usecases/get_attendance_status_usecase.dart';
 import 'domain/usecases/get_todays_shift_usecase.dart';
-import 'domain/validators/clock_in_validator.dart';
-import 'domain/validators/composite_clock_in_validator.dart';
-import 'domain/validators/geofence_validator.dart';
-import 'domain/validators/override_notes_validator.dart';
-import 'domain/validators/time_window_validator.dart';
+import 'domain/validators/validators/clock_in_validator.dart';
+import 'domain/validators/validators/composite_clock_in_validator.dart';
+import 'domain/validators/validators/geofence_validator.dart';
+import 'domain/validators/validators/override_notes_validator.dart';
+import 'domain/validators/validators/time_window_validator.dart';
 import 'presentation/bloc/clock_in/clock_in_bloc.dart';
 import 'presentation/bloc/geofence/geofence_bloc.dart';
 import 'presentation/pages/clock_in_page.dart';