diff --git a/lib/dto/delivery.dart b/lib/dto/delivery.dart
index f8b7df8..258bea9 100644
--- a/lib/dto/delivery.dart
+++ b/lib/dto/delivery.dart
@@ -4,7 +4,6 @@ import 'article.dart';
 import 'contact_person.dart';
 import 'customer.dart';
 import 'discount.dart';
-import 'image.dart';
 import 'note.dart';
 import 'payment.dart';
 import 'package:json_annotation/json_annotation.dart';
diff --git a/lib/dto/delivery_update.dart b/lib/dto/delivery_update.dart
index 2f0bd3d..f6448c6 100644
--- a/lib/dto/delivery_update.dart
+++ b/lib/dto/delivery_update.dart
@@ -1,5 +1,4 @@
 import 'package:hl_lieferservice/model/delivery.dart';
-import 'package:intl/intl.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'delivery_update.g.dart';
diff --git a/lib/dto/discount_add_response.dart b/lib/dto/discount_add_response.dart
index 0edf7c8..f0535d5 100644
--- a/lib/dto/discount_add_response.dart
+++ b/lib/dto/discount_add_response.dart
@@ -59,5 +59,6 @@ class DiscountAddResponseDTO extends BasicResponseDTO {
   factory DiscountAddResponseDTO.fromJson(Map<String, dynamic> json) =>
       _$DiscountAddResponseDTOFromJson(json);
 
+  @override
   Map<dynamic, dynamic> toJson() => _$DiscountAddResponseDTOToJson(this);
 }
diff --git a/lib/dto/discount_remove_response.dart b/lib/dto/discount_remove_response.dart
index b88389b..6b94347 100644
--- a/lib/dto/discount_remove_response.dart
+++ b/lib/dto/discount_remove_response.dart
@@ -18,5 +18,6 @@ class DiscountRemoveResponseDTO extends BasicResponseDTO {
   factory DiscountRemoveResponseDTO.fromJson(Map<String, dynamic> json) =>
       _$DiscountRemoveResponseDTOFromJson(json);
 
+  @override
   Map<dynamic, dynamic> toJson() => _$DiscountRemoveResponseDTOToJson(this);
 }
\ No newline at end of file
diff --git a/lib/dto/discount_update_response.dart b/lib/dto/discount_update_response.dart
index 7bdc3e6..e0a2c7d 100644
--- a/lib/dto/discount_update_response.dart
+++ b/lib/dto/discount_update_response.dart
@@ -1,4 +1,3 @@
-import 'package:hl_lieferservice/dto/article.dart';
 
 import 'basic_response.dart';
 import 'discount_add_response.dart';
@@ -18,5 +17,6 @@ class DiscountUpdateResponseDTO extends BasicResponseDTO {
   factory DiscountUpdateResponseDTO.fromJson(Map<String, dynamic> json) =>
       _$DiscountUpdateResponseDTOFromJson(json);
 
+  @override
   Map<dynamic, dynamic> toJson() => _$DiscountUpdateResponseDTOToJson(this);
 }
diff --git a/lib/dto/image_note_response.dart b/lib/dto/image_note_response.dart
index f417809..77d0a1b 100644
--- a/lib/dto/image_note_response.dart
+++ b/lib/dto/image_note_response.dart
@@ -1,4 +1,3 @@
-import 'note.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'image_note_response.g.dart';
diff --git a/lib/dto/note_add_response.dart b/lib/dto/note_add_response.dart
index 64116c9..0e09cc4 100644
--- a/lib/dto/note_add_response.dart
+++ b/lib/dto/note_add_response.dart
@@ -12,5 +12,6 @@ class NoteAddResponseDTO extends BasicResponseDTO {
   final NoteDTO? note;
 
   factory NoteAddResponseDTO.fromJson(Map<String, dynamic> json) => _$NoteAddResponseDTOFromJson(json);
+  @override
   Map<dynamic, dynamic> toJson() => _$NoteAddResponseDTOToJson(this);
 }
\ No newline at end of file
diff --git a/lib/feature/cars/presentation/car_dialog.dart b/lib/feature/cars/presentation/car_dialog.dart
index 24ba038..9a79a83 100644
--- a/lib/feature/cars/presentation/car_dialog.dart
+++ b/lib/feature/cars/presentation/car_dialog.dart
@@ -19,7 +19,6 @@ class CarDialog extends StatefulWidget {
 }
 
 class _CarDialogState extends State<CarDialog> {
-  bool _isLoading = false;
   final _formKey = GlobalKey<FormState>();
   late final TextEditingController _plateController;
 
diff --git a/lib/feature/cars/presentation/car_management_page.dart b/lib/feature/cars/presentation/car_management_page.dart
index fb6ed1e..9c98208 100644
--- a/lib/feature/cars/presentation/car_management_page.dart
+++ b/lib/feature/cars/presentation/car_management_page.dart
@@ -6,9 +6,9 @@ import 'package:hl_lieferservice/feature/cars/bloc/cars_bloc.dart';
 import 'package:hl_lieferservice/feature/cars/bloc/cars_event.dart';
 import 'package:hl_lieferservice/feature/cars/bloc/cars_state.dart';
 import 'package:hl_lieferservice/feature/cars/presentation/car_management.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/model/car.dart';
 
 class CarManagementPage extends StatefulWidget {
diff --git a/lib/feature/delivery/overview/bloc/tour_bloc.dart b/lib/feature/delivery/bloc/tour_bloc.dart
similarity index 98%
rename from lib/feature/delivery/overview/bloc/tour_bloc.dart
rename to lib/feature/delivery/bloc/tour_bloc.dart
index 543a686..e1bd09d 100644
--- a/lib/feature/delivery/overview/bloc/tour_bloc.dart
+++ b/lib/feature/delivery/bloc/tour_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/model/sorting_information.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/repository/tour_repository.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/service/distance_service.dart';
@@ -325,7 +325,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
             );
             break;
         }
-      } on TourNotFoundException catch (e) {
+      } on TourNotFoundException {
         opBloc.add(FailOperation(message: "Fehler beim Scannen des Artikels"));
       }
     }
diff --git a/lib/feature/delivery/overview/bloc/tour_event.dart b/lib/feature/delivery/bloc/tour_event.dart
similarity index 100%
rename from lib/feature/delivery/overview/bloc/tour_event.dart
rename to lib/feature/delivery/bloc/tour_event.dart
diff --git a/lib/feature/delivery/overview/bloc/tour_state.dart b/lib/feature/delivery/bloc/tour_state.dart
similarity index 100%
rename from lib/feature/delivery/overview/bloc/tour_state.dart
rename to lib/feature/delivery/bloc/tour_state.dart
diff --git a/lib/feature/delivery/detail/bloc/note_event.dart b/lib/feature/delivery/detail/bloc/note_event.dart
index 7918839..289b72d 100644
--- a/lib/feature/delivery/detail/bloc/note_event.dart
+++ b/lib/feature/delivery/detail/bloc/note_event.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 
 import 'package:hl_lieferservice/model/delivery.dart';
 import 'package:image_picker/image_picker.dart';
diff --git a/lib/feature/delivery/detail/bloc/note_state.dart b/lib/feature/delivery/detail/bloc/note_state.dart
index f5a279c..113e403 100644
--- a/lib/feature/delivery/detail/bloc/note_state.dart
+++ b/lib/feature/delivery/detail/bloc/note_state.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 
 import 'package:hl_lieferservice/model/delivery.dart';
 
diff --git a/lib/feature/delivery/detail/model/note.dart b/lib/feature/delivery/detail/model/note.dart
index b625c8a..9cab48a 100644
--- a/lib/feature/delivery/detail/model/note.dart
+++ b/lib/feature/delivery/detail/model/note.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 
 import 'package:hl_lieferservice/model/article.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
diff --git a/lib/feature/delivery/detail/presentation/article/article_reset_scan_dialog.dart b/lib/feature/delivery/detail/presentation/article/article_reset_scan_dialog.dart
index 08bd15d..52ae391 100644
--- a/lib/feature/delivery/detail/presentation/article/article_reset_scan_dialog.dart
+++ b/lib/feature/delivery/detail/presentation/article/article_reset_scan_dialog.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
 
 import '../../../../../model/article.dart';
 
diff --git a/lib/feature/delivery/detail/presentation/article/article_unscan_dialog.dart b/lib/feature/delivery/detail/presentation/article/article_unscan_dialog.dart
index 3d4852e..1c4fab1 100644
--- a/lib/feature/delivery/detail/presentation/article/article_unscan_dialog.dart
+++ b/lib/feature/delivery/detail/presentation/article/article_unscan_dialog.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
 
 import '../../../../../model/article.dart';
 
diff --git a/lib/feature/delivery/detail/presentation/delivery_detail_page.dart b/lib/feature/delivery/detail/presentation/delivery_detail_page.dart
index b5332d8..934a02e 100644
--- a/lib/feature/delivery/detail/presentation/delivery_detail_page.dart
+++ b/lib/feature/delivery/detail/presentation/delivery_detail_page.dart
@@ -7,13 +7,10 @@ import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_event.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_sign.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step.dart';
-import 'package:hl_lieferservice/feature/delivery/detail/repository/note_repository.dart';
-import 'package:hl_lieferservice/feature/delivery/detail/service/notes_service.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
-import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
 
 class DeliveryDetail extends StatefulWidget {
   final String deliveryId;
diff --git a/lib/feature/delivery/detail/presentation/delivery_discount.dart b/lib/feature/delivery/detail/presentation/delivery_discount.dart
index d969519..00a22dd 100644
--- a/lib/feature/delivery/detail/presentation/delivery_discount.dart
+++ b/lib/feature/delivery/detail/presentation/delivery_discount.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 
-import '../../overview/bloc/tour_event.dart';
+import '../../bloc/tour_event.dart';
 
 class DeliveryDiscount extends StatefulWidget {
   const DeliveryDiscount({
@@ -176,8 +176,8 @@ class _DeliveryDiscountState extends State<DeliveryDiscount> {
               ),
               _incrementDiscount(),
               const Padding(
-                padding: const EdgeInsets.only(top: 10),
-                child: const Text(
+                padding: EdgeInsets.only(top: 10),
+                child: Text(
                   "Begründung:",
                   style: TextStyle(fontWeight: FontWeight.bold),
                 ),
diff --git a/lib/feature/delivery/detail/presentation/delivery_options.dart b/lib/feature/delivery/detail/presentation/delivery_options.dart
index 9807a02..83e830b 100644
--- a/lib/feature/delivery/detail/presentation/delivery_options.dart
+++ b/lib/feature/delivery/detail/presentation/delivery_options.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
 import 'package:hl_lieferservice/model/delivery.dart' as model;
 
-import '../../overview/bloc/tour_event.dart';
+import '../../bloc/tour_event.dart';
 
 class DeliveryOptionsView extends StatefulWidget {
   const DeliveryOptionsView({
diff --git a/lib/feature/delivery/detail/presentation/delivery_sign.dart b/lib/feature/delivery/detail/presentation/delivery_sign.dart
index a66556e..2f97324 100644
--- a/lib/feature/delivery/detail/presentation/delivery_sign.dart
+++ b/lib/feature/delivery/detail/presentation/delivery_sign.dart
@@ -1,11 +1,9 @@
-import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_event.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_state.dart';
-import 'package:hl_lieferservice/model/customer.dart';
 import 'package:flutter/material.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/feature/delivery/detail/presentation/delivery_summary.dart b/lib/feature/delivery/detail/presentation/delivery_summary.dart
index 675088f..f3d6808 100644
--- a/lib/feature/delivery/detail/presentation/delivery_summary.dart
+++ b/lib/feature/delivery/detail/presentation/delivery_summary.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 
 import '../../../../model/tour.dart';
diff --git a/lib/feature/delivery/detail/presentation/note/note_edit_dialog.dart b/lib/feature/delivery/detail/presentation/note/note_edit_dialog.dart
index 8026d0c..b9a758d 100644
--- a/lib/feature/delivery/detail/presentation/note/note_edit_dialog.dart
+++ b/lib/feature/delivery/detail/presentation/note/note_edit_dialog.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart';
diff --git a/lib/feature/delivery/detail/presentation/note/note_list_item.dart b/lib/feature/delivery/detail/presentation/note/note_list_item.dart
index bfe4527..455aac9 100644
--- a/lib/feature/delivery/detail/presentation/note/note_list_item.dart
+++ b/lib/feature/delivery/detail/presentation/note/note_list_item.dart
@@ -4,10 +4,8 @@ import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_event.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/model/note.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/presentation/note/note_edit_dialog.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
-
-import '../../../../../model/delivery.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 
 enum NoteItemAction { noteEdit, noteDelete }
 
diff --git a/lib/feature/delivery/detail/presentation/note/note_overview.dart b/lib/feature/delivery/detail/presentation/note/note_overview.dart
index 4faca9f..acbbeb2 100644
--- a/lib/feature/delivery/detail/presentation/note/note_overview.dart
+++ b/lib/feature/delivery/detail/presentation/note/note_overview.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/feature/delivery/detail/presentation/steps/step_article_management.dart b/lib/feature/delivery/detail/presentation/steps/step_article_management.dart
index f0edf1e..4d4711b 100644
--- a/lib/feature/delivery/detail/presentation/steps/step_article_management.dart
+++ b/lib/feature/delivery/detail/presentation/steps/step_article_management.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/presentation/article/article_list.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_discount.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 
 class DeliveryStepArticleManagement extends StatefulWidget {
diff --git a/lib/feature/delivery/detail/presentation/steps/step_info.dart b/lib/feature/delivery/detail/presentation/steps/step_info.dart
index 4d8803a..f6de07f 100644
--- a/lib/feature/delivery/detail/presentation/steps/step_info.dart
+++ b/lib/feature/delivery/detail/presentation/steps/step_info.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
 import 'package:hl_lieferservice/model/article.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../../../overview/bloc/tour_bloc.dart';
-import '../../../overview/bloc/tour_state.dart';
+import '../../../bloc/tour_bloc.dart';
+import '../../../bloc/tour_state.dart';
 
 class DeliveryStepInfo extends StatefulWidget {
   final Delivery delivery;
diff --git a/lib/feature/delivery/detail/presentation/steps/step_note.dart b/lib/feature/delivery/detail/presentation/steps/step_note.dart
index cfd5e57..437fb6b 100644
--- a/lib/feature/delivery/detail/presentation/steps/step_note.dart
+++ b/lib/feature/delivery/detail/presentation/steps/step_note.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/feature/delivery/overview/model/sorting_information.dart b/lib/feature/delivery/overview/model/sorting_information.dart
index 934abb6..56f562e 100644
--- a/lib/feature/delivery/overview/model/sorting_information.dart
+++ b/lib/feature/delivery/overview/model/sorting_information.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 
 class SortingInformation {
   String deliveryId;
diff --git a/lib/feature/delivery/overview/presentation/delivery_item.dart b/lib/feature/delivery/overview/presentation/delivery_item.dart
index facf160..e6a8a72 100644
--- a/lib/feature/delivery/overview/presentation/delivery_item.dart
+++ b/lib/feature/delivery/overview/presentation/delivery_item.dart
@@ -3,8 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_detail_page.dart';
 
-import '../../../../bloc/app_bloc.dart';
-import '../../../../bloc/app_states.dart';
 import '../../../../widget/operations/bloc/operation_bloc.dart';
 import '../../detail/bloc/note_bloc.dart';
 import '../../detail/repository/note_repository.dart';
diff --git a/lib/feature/delivery/overview/presentation/delivery_list.dart b/lib/feature/delivery/overview/presentation/delivery_list.dart
index 9d76c25..cf0c28c 100644
--- a/lib/feature/delivery/overview/presentation/delivery_list.dart
+++ b/lib/feature/delivery/overview/presentation/delivery_list.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/model/sorting_information.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
diff --git a/lib/feature/delivery/overview/presentation/delivery_overview.dart b/lib/feature/delivery/overview/presentation/delivery_overview.dart
index 276a5e6..55cfae8 100644
--- a/lib/feature/delivery/overview/presentation/delivery_overview.dart
+++ b/lib/feature/delivery/overview/presentation/delivery_overview.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_info.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_list.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart';
diff --git a/lib/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart b/lib/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart
index 0d02ddb..c318bde 100644
--- a/lib/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart
+++ b/lib/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/model/delivery.dart';
 
 import '../model/sorting_information.dart';
diff --git a/lib/feature/delivery/overview/presentation/delivery_overview_page.dart b/lib/feature/delivery/overview/presentation/delivery_overview_page.dart
index 1c2bc6d..04487f8 100644
--- a/lib/feature/delivery/overview/presentation/delivery_overview_page.dart
+++ b/lib/feature/delivery/overview/presentation/delivery_overview_page.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview.dart';
 
-import '../bloc/tour_bloc.dart';
-import '../bloc/tour_state.dart';
+import '../../bloc/tour_bloc.dart';
+import '../../bloc/tour_state.dart';
 
 class DeliveryOverviewPage extends StatefulWidget {
   const DeliveryOverviewPage({super.key});
diff --git a/lib/feature/scan/presentation/scan_page.dart b/lib/feature/scan/presentation/scan_page.dart
index c7fe549..4897b02 100644
--- a/lib/feature/scan/presentation/scan_page.dart
+++ b/lib/feature/scan/presentation/scan_page.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:mobile_scanner/mobile_scanner.dart';
-
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/feature/scan/presentation/scan_screen.dart';
 import 'package:hl_lieferservice/model/tour.dart';
 import 'package:hl_lieferservice/widget/home/bloc/navigation_bloc.dart';
diff --git a/lib/feature/scan/presentation/scan_screen.dart b/lib/feature/scan/presentation/scan_screen.dart
index c5c9c46..ffdb16e 100644
--- a/lib/feature/scan/presentation/scan_screen.dart
+++ b/lib/feature/scan/presentation/scan_screen.dart
@@ -4,8 +4,8 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
 import 'package:hl_lieferservice/feature/scan/presentation/scanner.dart';
 import 'package:hl_lieferservice/feature/settings/bloc/settings_bloc.dart';
 import 'package:hl_lieferservice/feature/settings/bloc/settings_state.dart';
@@ -16,7 +16,7 @@ import 'package:hl_lieferservice/model/tour.dart';
 import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
 import 'package:hl_lieferservice/widget/operations/bloc/operation_event.dart';
 
-import '../../delivery/overview/bloc/tour_bloc.dart';
+import '../../delivery/bloc/tour_bloc.dart';
 
 class ArticleScanningScreen extends StatefulWidget {
   const ArticleScanningScreen({super.key});
diff --git a/lib/feature/scan/presentation/scanner.dart b/lib/feature/scan/presentation/scanner.dart
index c4dff23..6b9b22c 100644
--- a/lib/feature/scan/presentation/scanner.dart
+++ b/lib/feature/scan/presentation/scanner.dart
@@ -6,9 +6,9 @@ class BarcodeScannerWidget extends StatefulWidget {
   final Function(String) onBarcodeDetected;
 
   const BarcodeScannerWidget({
-    Key? key,
+    super.key,
     required this.onBarcodeDetected,
-  }) : super(key: key);
+  });
 
   @override
   State<BarcodeScannerWidget> createState() => _BarcodeScannerWidgetState();
diff --git a/lib/model/article.dart b/lib/model/article.dart
index 6aeaa79..6a45309 100644
--- a/lib/model/article.dart
+++ b/lib/model/article.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:hl_lieferservice/dto/article.dart';
 
 class Article {
diff --git a/lib/model/delivery.dart b/lib/model/delivery.dart
index 38a2fa5..7aca977 100644
--- a/lib/model/delivery.dart
+++ b/lib/model/delivery.dart
@@ -3,13 +3,11 @@ import 'dart:typed_data';
 import 'package:flutter/cupertino.dart';
 import 'package:hl_lieferservice/dto/contact_person.dart';
 import 'package:hl_lieferservice/dto/delivery.dart';
-import 'package:hl_lieferservice/dto/image.dart';
 import 'package:hl_lieferservice/dto/image_note_response.dart';
 import 'package:hl_lieferservice/dto/note.dart';
 import 'package:hl_lieferservice/dto/note_template.dart';
 import 'package:hl_lieferservice/model/tour.dart';
 import 'package:hl_lieferservice/util.dart';
-import '../dto/payment.dart';
 import 'article.dart';
 import 'customer.dart';
 
diff --git a/lib/widget/app.dart b/lib/widget/app.dart
index 41e2bdb..b743d48 100644
--- a/lib/widget/app.dart
+++ b/lib/widget/app.dart
@@ -5,7 +5,7 @@ import 'package:hl_lieferservice/feature/authentication/bloc/auth_bloc.dart';
 import 'package:hl_lieferservice/feature/authentication/presentation/login_enforcer.dart';
 import 'package:hl_lieferservice/feature/authentication/service/userinfo.dart';
 import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/repository/tour_repository.dart';
 import 'package:hl_lieferservice/widget/home/bloc/navigation_bloc.dart';
 import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
diff --git a/lib/widget/home/presentation/home.dart b/lib/widget/home/presentation/home.dart
index 4cf2eda..0901edc 100644
--- a/lib/widget/home/presentation/home.dart
+++ b/lib/widget/home/presentation/home.dart
@@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/feature/authentication/bloc/auth_bloc.dart';
 import 'package:hl_lieferservice/feature/authentication/bloc/auth_state.dart';
 import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart';
-import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
 import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_page.dart';
 import 'package:hl_lieferservice/feature/scan/presentation/scan_page.dart';
 import 'package:hl_lieferservice/widget/app_bar.dart';
diff --git a/lib/widget/operations/presentation/operation_view_enforcer.dart b/lib/widget/operations/presentation/operation_view_enforcer.dart
index b190ff3..f99339d 100644
--- a/lib/widget/operations/presentation/operation_view_enforcer.dart
+++ b/lib/widget/operations/presentation/operation_view_enforcer.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
-import 'package:hl_lieferservice/widget/operations/presentation/message_container.dart';
 
 import '../bloc/operation_state.dart';
 
diff --git a/pubspec.yaml b/pubspec.yaml
index dc94a61..d92b012 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -53,6 +53,7 @@ dependencies:
   shared_preferences: ^2.5.3
   rxdart: ^0.28.0
 
+  collection: any
 dev_dependencies:
   build_runner: ^2.5.4
   flutter_test: