diff --git a/em2rp/pubspec.yaml b/em2rp/pubspec.yaml
index 0aa84f9..e95f30f 100644
--- a/em2rp/pubspec.yaml
+++ b/em2rp/pubspec.yaml
@@ -10,59 +10,65 @@ dependencies:
   flutter:
     sdk: flutter
   
+  # Firebase & Authentication
   firebase_core: ^4.2.0
   firebase_auth: ^6.1.1
   cloud_firestore: ^6.0.3
   cloud_functions: ^6.0.4
   google_sign_in: ^7.2.0
-  provider: ^6.1.2
   firebase_storage: ^13.0.3
-  image_picker: ^1.1.2
-  universal_io: ^2.2.2
+
+  # State Management
+  provider: ^6.1.2
+
+  # UI Core
   cupertino_icons: ^1.0.2
+  google_fonts: ^6.1.0
+  flutter_svg: ^2.2.1
+  cached_network_image: ^3.3.1
+  flutter_slidable: ^4.0.0
+  flutter_localizations:
+    sdk: flutter
+
+  # Calendar & Dates
   table_calendar: ^3.0.9
   intl: ^0.20.2
-  google_maps_flutter: ^2.5.0
-  permission_handler: ^12.0.0+1
-  geolocator: ^14.0.1
-  flutter_map: ^8.1.1
-  latlong2: ^0.9.0
-  flutter_launcher_icons: ^0.14.3
-  flutter_native_splash: ^2.3.9
-  url_launcher: ^6.2.2
-  share_plus: ^12.0.1
+  timezone: ^0.10.1
+
+  # Storage & Files
   path_provider: ^2.1.2
+  flutter_secure_storage: ^9.0.0
+  file_picker: ^10.1.9
+  image_picker: ^1.1.2
+  flutter_dropzone: ^4.2.1
+  path: any
+
+  # PDF & Documents
   pdf: ^3.10.7
   printing: ^5.11.1
   qr_flutter: ^4.1.0
   mobile_scanner: ^5.2.3
-  flutter_local_notifications: ^19.2.1
-  timezone: ^0.10.1
-  flutter_secure_storage: ^9.0.0
-  http: ^1.1.2
-  flutter_dotenv: ^6.0.0
-  google_fonts: ^6.1.0
-  flutter_svg: ^2.2.1
-  cached_network_image: ^3.3.1
-  flutter_staggered_grid_view: ^0.7.0
-  shimmer: ^3.0.0
-  flutter_slidable: ^4.0.0
-  flutter_datetime_picker: ^1.5.1
-  flutter_colorpicker: ^1.0.3
-  flutter_rating_bar: ^4.0.1
-  flutter_chat_ui: ^2.3.1
-  flutter_chat_types: ^3.6.2
-  uuid: ^4.2.2
-  file_picker: ^10.1.9
-  flutter_dropzone: ^4.2.1
-  flutter_localizations:
-    sdk: flutter
-  timeago: ^3.6.1
-  audioplayers: ^6.1.0
 
-  path: any
+  # Network & API
+  http: ^1.1.2
+  universal_io: ^2.2.2
+  flutter_dotenv: ^6.0.0
+
+  # Sharing & Launch
+  url_launcher: ^6.2.2
+  share_plus: ^12.0.1
+
+  # Notifications
+  flutter_local_notifications: ^19.2.1
+
+  # Export/Import
   csv: ^6.0.0
   web: ^1.1.1
+  uuid: ^4.2.2
+
+  # Build-time tools (dev)
+  flutter_launcher_icons: ^0.14.3
+  flutter_native_splash: ^2.3.9
 dev_dependencies:
   flutter_test:
     sdk: flutter