diff --git a/.gitignore b/.gitignore
index 20895aa2..dc9e546f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 .history
 .svn/
 migrate_working_dir/
+.local/
+.fvm/
 
 # IntelliJ related
 *.iml
@@ -32,4 +34,4 @@ build/
 # Project
 **/config.dart
 **/google_api_key.xml
-example/android/app/.cxx/*
\ No newline at end of file
+example/android/app/.cxx/*
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 49817922..ae61ff1b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -166,7 +166,7 @@ steps:
           git checkout $(currentBranch)
 
           echo -e "\n[+] Change version in pubspec.yaml\n"
-          sed "s/^version:\s[0-9].*$/version: $(version)/g" -i pubspec.yaml  
+          sed "s/^version:\s[0-9].*$/version: $(version)/g" -i pubspec.yaml
           echo -e "\n[+] Change version in situm_flutter.podspec"
           sed "s/s.version\s.*= '[0-9\.].*'$/s.version          = '$(version)'/g" -i ios/situm_flutter.podspec
           echo -e "\n[+] Set new plugin version in examples"
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
index 1dc6cf76..391a902b 100644
--- a/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index a0fabceb..c7d76bfb 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,11 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - Protobuf (3.29.6)
-  - situm_flutter (3.27.24):
+  - situm_flutter (3.27.40):
     - Flutter
-    - SitumSDK (~> 3.37.2)
-  - SitumSDK (3.37.2):
-    - Protobuf (~> 3.18)
+    - SitumSDK (~> 3.40.0)
+  - SitumSDK (3.40.0):
     - SSZipArchive (~> 2.4)
   - SSZipArchive (2.4.3)
   - webview_flutter_wkwebview (0.0.1):
@@ -18,7 +16,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - Protobuf
     - SitumSDK
     - SSZipArchive
 
@@ -32,12 +29,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  Protobuf: 8d5596f7468be5400861a6bbfb2dfe9d0d1cde34
-  situm_flutter: 6988c6b372f87f5de06e4214370317b6b54659c3
-  SitumSDK: b6c6b9b13335b66e2da6a298c717f2493ae8fa78
+  situm_flutter: 13203e4786e0cb55c5ea061b9603275e4f1f0e65
+  SitumSDK: 172f2a95374f51d19ee33abc86b870a227043b1d
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
 
 PODFILE CHECKSUM: 3b749f30a8d5a341f7ae96d089e4c79a0780f0e5
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.14.3
diff --git a/example/pubspec.lock b/example/pubspec.lock
index a2255d56..e32c79dd 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -21,26 +21,26 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -79,26 +79,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -111,34 +111,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.18.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -158,7 +158,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -171,18 +171,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
@@ -203,18 +203,18 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.11"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -256,5 +256,5 @@ packages:
     source: hosted
     version: "3.10.2"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.10.0-0 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/ios/situm_flutter.podspec b/ios/situm_flutter.podspec
index ea2836de..4e9af10e 100644
--- a/ios/situm_flutter.podspec
+++ b/ios/situm_flutter.podspec
@@ -13,7 +13,8 @@ Pod::Spec.new do |s|
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Situm Technologies S.L.' => 'situm@situm.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
+  s.source_files = 'situm_flutter/Sources/situm_flutter/**/*.{h,m}'
+  s.public_header_files = 'situm_flutter/Sources/situm_flutter/include/situm_flutter/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'SitumSDK', '~> 3.40.0'
   s.platform = :ios, '9.0'
diff --git a/ios/Classes/SITFSDKPlugin.m b/ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
similarity index 100%
rename from ios/Classes/SITFSDKPlugin.m
rename to ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
diff --git a/ios/Classes/SITFSDKUtils.m b/ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
similarity index 100%
rename from ios/Classes/SITFSDKUtils.m
rename to ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
diff --git a/ios/Classes/SITNavigationHandler.m b/ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
similarity index 100%
rename from ios/Classes/SITNavigationHandler.m
rename to ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
diff --git a/ios/Classes/SITTextToSpeechManager.m b/ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
similarity index 100%
rename from ios/Classes/SITTextToSpeechManager.m
rename to ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
diff --git a/ios/Classes/SitumFlutterWayfindingPlugin.m b/ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
similarity index 100%
rename from ios/Classes/SitumFlutterWayfindingPlugin.m
rename to ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
diff --git a/ios/Classes/SITFSDKPlugin.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
similarity index 100%
rename from ios/Classes/SITFSDKPlugin.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
diff --git a/ios/Classes/SITFSDKUtils.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
similarity index 100%
rename from ios/Classes/SITFSDKUtils.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
diff --git a/ios/Classes/SITNavigationHandler.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
similarity index 100%
rename from ios/Classes/SITNavigationHandler.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
diff --git a/ios/Classes/SITTextToSpeechManager.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
similarity index 100%
rename from ios/Classes/SITTextToSpeechManager.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
diff --git a/ios/Classes/SitumFlutterWayfindingPlugin.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
similarity index 100%
rename from ios/Classes/SitumFlutterWayfindingPlugin.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
diff --git a/ios/Classes/situm_flutter-Bridging-Header.h b/ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h
similarity index 100%
rename from ios/Classes/situm_flutter-Bridging-Header.h
rename to ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h