From 57699d85312839406535c0b9f9703ebf18731bc3 Mon Sep 17 00:00:00 2001
From: fsvilas <fernando.sanchez@situm.com>
Date: Wed, 15 Jul 2026 14:35:37 +0200
Subject: [PATCH 1/3] Folder reestructuration to transition to spm

---
 .gitignore                                    |   4 +-
 README.md                                     | 118 +-----------------
 azure-pipelines.yml                           |  14 ++-
 example/README.md                             |   6 +-
 example/azure/common-steps.yaml               |   2 +-
 example/pubspec.lock                          |   2 +-
 example/pubspec.yaml                          |   4 +-
 .metadata => situm_flutter/.metadata          |   0
 CHANGELOG.md => situm_flutter/CHANGELOG.md    |   0
 .../CHANGELOG_UNRELEASED.md                   |   0
 LICENSE => situm_flutter/LICENSE              |   0
 situm_flutter/README.md                       | 116 +++++++++++++++++
 .../analysis_options.yaml                     |   0
 {android => situm_flutter/android}/.gitignore |   0
 .../android}/build.gradle                     |   0
 .../android}/settings.gradle                  |   0
 .../android}/src/main/AndroidManifest.xml     |   0
 .../situm/situm_flutter/AccessibilityHack.kt  |   0
 .../com/situm/situm_flutter/AutoStop.kt       |   0
 .../com/situm/situm_flutter/Extensions.kt     |   0
 .../com/situm/situm_flutter/Navigation.kt     |   0
 .../situm/situm_flutter/SitumFlutterPlugin.kt |   0
 .../situm_flutter/TextToSpeechManager.kt      |   0
 .../situm/situm_flutter/ViewerNavigation.kt   |   0
 {ios => situm_flutter/ios}/.gitignore         |   0
 {ios => situm_flutter/ios}/Assets/.gitkeep    |   0
 .../ios}/situm_flutter.podspec                |   3 +-
 .../Sources/situm_flutter}/SITFSDKPlugin.m    |   0
 .../Sources/situm_flutter}/SITFSDKUtils.m     |   0
 .../situm_flutter}/SITNavigationHandler.m     |   0
 .../situm_flutter}/SITTextToSpeechManager.m   |   0
 .../SitumFlutterWayfindingPlugin.m            |   0
 .../include/situm_flutter}/SITFSDKPlugin.h    |   0
 .../include/situm_flutter}/SITFSDKUtils.h     |   0
 .../situm_flutter}/SITNavigationHandler.h     |   0
 .../situm_flutter}/SITTextToSpeechManager.h   |   0
 .../SitumFlutterWayfindingPlugin.h            |   0
 .../situm_flutter-Bridging-Header.h           |   0
 {lib => situm_flutter/lib}/sdk.dart           |   0
 .../src/adapters/location_error_adapter.dart  |   0
 .../src/adapters/location_status_adapter.dart |   0
 .../lib}/src/controller.dart                  |   0
 .../lib}/src/definitions.dart                 |   0
 {lib => situm_flutter/lib}/src/mapper.dart    |   0
 .../lib}/src/message_handlers.dart            |   0
 .../lib}/src/sdk_controller.dart              |   0
 .../lib}/src/sdk_definitions.dart             |   0
 .../lib}/src/sdk_mapper.dart                  |   0
 .../lib}/src/situm_map_view.dart              |   0
 {lib => situm_flutter/lib}/src/ui_utils.dart  |   0
 {lib => situm_flutter/lib}/wayfinding.dart    |   0
 pubspec.yaml => situm_flutter/pubspec.yaml    |   0
 .../test}/situm_flutter_test.dart             |   0
 53 files changed, 141 insertions(+), 128 deletions(-)
 rename .metadata => situm_flutter/.metadata (100%)
 rename CHANGELOG.md => situm_flutter/CHANGELOG.md (100%)
 rename CHANGELOG_UNRELEASED.md => situm_flutter/CHANGELOG_UNRELEASED.md (100%)
 rename LICENSE => situm_flutter/LICENSE (100%)
 create mode 100644 situm_flutter/README.md
 rename analysis_options.yaml => situm_flutter/analysis_options.yaml (100%)
 rename {android => situm_flutter/android}/.gitignore (100%)
 rename {android => situm_flutter/android}/build.gradle (100%)
 rename {android => situm_flutter/android}/settings.gradle (100%)
 rename {android => situm_flutter/android}/src/main/AndroidManifest.xml (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/Extensions.kt (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/Navigation.kt (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt (100%)
 rename {android => situm_flutter/android}/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt (100%)
 rename {ios => situm_flutter/ios}/.gitignore (100%)
 rename {ios => situm_flutter/ios}/Assets/.gitkeep (100%)
 rename {ios => situm_flutter/ios}/situm_flutter.podspec (84%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter}/SITFSDKPlugin.m (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter}/SITFSDKUtils.m (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter}/SITNavigationHandler.m (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter}/SITTextToSpeechManager.m (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter}/SitumFlutterWayfindingPlugin.m (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter}/SITFSDKPlugin.h (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter}/SITFSDKUtils.h (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter}/SITNavigationHandler.h (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter}/SITTextToSpeechManager.h (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter}/SitumFlutterWayfindingPlugin.h (100%)
 rename {ios/Classes => situm_flutter/ios/situm_flutter/Sources/situm_flutter}/situm_flutter-Bridging-Header.h (100%)
 rename {lib => situm_flutter/lib}/sdk.dart (100%)
 rename {lib => situm_flutter/lib}/src/adapters/location_error_adapter.dart (100%)
 rename {lib => situm_flutter/lib}/src/adapters/location_status_adapter.dart (100%)
 rename {lib => situm_flutter/lib}/src/controller.dart (100%)
 rename {lib => situm_flutter/lib}/src/definitions.dart (100%)
 rename {lib => situm_flutter/lib}/src/mapper.dart (100%)
 rename {lib => situm_flutter/lib}/src/message_handlers.dart (100%)
 rename {lib => situm_flutter/lib}/src/sdk_controller.dart (100%)
 rename {lib => situm_flutter/lib}/src/sdk_definitions.dart (100%)
 rename {lib => situm_flutter/lib}/src/sdk_mapper.dart (100%)
 rename {lib => situm_flutter/lib}/src/situm_map_view.dart (100%)
 rename {lib => situm_flutter/lib}/src/ui_utils.dart (100%)
 rename {lib => situm_flutter/lib}/wayfinding.dart (100%)
 rename pubspec.yaml => situm_flutter/pubspec.yaml (100%)
 rename {test => situm_flutter/test}/situm_flutter_test.dart (100%)

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/README.md b/README.md
index 095665cf..0c85d49d 100644
--- a/README.md
+++ b/README.md
@@ -1,116 +1,8 @@
-<p align="center"> <img width="233" src="https://situm.com/wp-content/themes/situm/img/logo-situm.svg" style="margin-bottom:1rem" />
-<h1 align="center">@situm/flutter</h1>
-</p>
+# Situm Flutter
 
-<p align="center" style="text-align:center">
+This repository contains the Situm Flutter plugin and its example application.
 
-[Situm Wayfinding](https://situm.com/wayfinding) for Flutter. Integrate plug&play navigation experience with floor plans, POIs, routes and turn-by-turn directions in no time. With the power of [Situm](https://www.situm.com/).
+- [Plugin README](./situm_flutter/README.md)
+- [Example app](./example/README.md)
 
-</p>
-
-<div align="center" style="text-align:center">
-
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-[![Pub Version](https://img.shields.io/pub/v/situm_flutter?color=blueviolet)](https://pub.dev/packages/situm_flutter)
-[![Flutter](https://img.shields.io/badge/{/}-flutter-blueviolet)](https://flutter.dev/)
-
-</div>
-
-## Getting Started
-
-There is a comprehensive tutorial on how to set-up a new application using this plugin on the Situm [documentation page](https://situm.com/docs/a-basic-flutter-app/).
-
-Below you will find the basic steps to install and configure the plugin on your Flutter project.
-These steps have already been done for you in the example application of this repository, but they are required for other projects.
-
-## Running the example
-
-Check the [example/README](./example/README.md) file of this repository to create your first Flutter application using Situm Flutter.
-
-## Configure the plugin on your Flutter project
-
-### Install the plugin
-
-To add the Situm dependency to your Flutter project, you can use the `flutter pub add` command. To add this dependency to your project, you can use the following command in your terminal:
-
-```
-flutter pub add situm_flutter
-```
-
-### Set up your Situm credentials
-
-Create a new `config.dart` file with your Situm credentials. You can use the contents of `example/config.dart.example` as example.
-
-Follow the [Wayfinding guide](https://situm.com/docs/first-steps-for-wayfinding/) if you haven't set
-up a Situm account.
-
-### Android
-
-1. Add the `ACCESS_FINE_LOCATION` permission to your `AndroidManifest.xml` file if you have configured Situm SDK to [use GPS](<https://developers.situm.com/sdk_documentation/android/javadoc/latest/es/situm/sdk/location/locationrequest#useGps()>):
-
-```xml
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-```
-
-2. Set the `minSdkVersion` to 21 or later on your app's `build.gradle` file.
-
-### iOS
-
-1. Remove the "use_frameworks!" directive in the `Podfile` of your iOS project:
-
-2. Run `pod install` or `pod update` to bring the dependencies to your project.
-
-3. Declare the following permissions in your app's `Info.plist` file to successfully start positioning:
-
-```
-<key>NSLocationWhenInUseUsageDescription</key>
-<string>Location is required to find out where you are</string>
-<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-<string>Location is required to find out where you are</string>
-<key>NSMotionUsageDescription</key>
-<string>We use your phone sensors (giroscope, accelerometer and altimeter) to improve location quality</string>
-```
-
-4. For offline support you will have to add the underlying web application's domain inside the entry `WKAppBoundDomains` on `Info.plist` as follows:
-
-```
-<key>WKAppBoundDomains</key>
-<array>
-	<string>map-viewer.situm.com</string>
-</array>
-```
-
-## Migrate from the old [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding)
-
-The new Situm Flutter package breaks compatibility with the previous [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding).
-Integrating the new version is simpler and more straightforward. If you want to migrate your application, follow the steps described in the [Situm documentation](https://situm.com/docs/flutter-wayfinding-migration-guide).
-
-## Versioning
-
-Please refer to [CHANGELOG.md](./CHANGELOG.md) for a list of notable changes for each version of the plugin.
-
-You can also see the [tags on this repository](./tags).
-
----
-
-## Submitting contributions
-
-You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://situm.com/contributions/).
-
----
-
-## License
-
-This project is licensed under the MIT - see the [LICENSE](./LICENSE) file for further details.
-
----
-
-## More information
-
-More info is available at our [Developers Page](https://situm.com/docs/01-introduction/).
-
----
-
-## Support information
-
-For any question or bug report, please send an email to [support@situm.com](mailto:support@situm.com)
+The Flutter package is located in [`situm_flutter/`](./situm_flutter).
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 49817922..43ad0baf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,6 +68,7 @@ steps:
           echo -e "\n[+] Get Dependencies\n"
           echo -e "##[command] flutter pub get \n"
 
+          cd situm_flutter
           flutter pub get
         displayName: Get Dependencies
 
@@ -166,9 +167,9 @@ 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 situm_flutter/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
+          sed "s/s.version\s.*= '[0-9\.].*'$/s.version          = '$(version)'/g" -i situm_flutter/ios/situm_flutter.podspec
           echo -e "\n[+] Set new plugin version in examples"
           cd example
           flutter pub get
@@ -222,6 +223,7 @@ steps:
           if [ -d "flutter" ];then
             cd flutter
           fi
+          cd situm_flutter
 
           echo -e "\n[+] Publish flutter package\n"
           dart pub publish --force
@@ -240,15 +242,15 @@ steps:
           git checkout master
           git pull origin master
 
-          iossdk=$(grep -i situmsdk ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
-          androidsdk=$(grep situm-sdk android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          iossdk=$(grep -i situmsdk situm_flutter/ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          androidsdk=$(grep situm-sdk situm_flutter/android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
 
           echo -e "\n[+] Checkout to previous commit\n"
           git checkout HEAD~1
 
 
-          iossdk_old=$(grep -i situmsdk ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
-          androidsdk_old=$(grep situm-sdk android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          iossdk_old=$(grep -i situmsdk situm_flutter/ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          androidsdk_old=$(grep situm-sdk situm_flutter/android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
 
           echo -e "\n[+] Return repository to master branch\n"
           git checkout master
diff --git a/example/README.md b/example/README.md
index 8d53b7a6..15fe1cc6 100644
--- a/example/README.md
+++ b/example/README.md
@@ -4,7 +4,7 @@
 
 <div align="center" style="text-align:center">
 
-A sample Flutter application to start learning the power of [Situm Flutter Plugin](../README.md).
+A sample Flutter application to start learning the power of [Situm Flutter Plugin](../situm_flutter/README.md).
 
 </div>
 
@@ -92,7 +92,7 @@ In case you want to learn how to use our plugin, you may want to take a look at
 
 We use [SemVer](http://semver.org/) for versioning.
 
-Please refer to [CHANGELOG.md](../CHANGELOG.md) for a list of notables changes for each version of the library.
+Please refer to [CHANGELOG.md](../situm_flutter/CHANGELOG.md) for a list of notables changes for each version of the library.
 
 You can also see the [tags on this repository](https://github.com/situmtech/flutter-wayfinding/tags).
 
@@ -102,7 +102,7 @@ You will need to sign a Contributor License Agreement (CLA) before making a subm
 
 ## License
 
-This project is licensed under the MIT - see the [LICENSE](../LICENSE) file for details.
+This project is licensed under the MIT - see the [LICENSE](../situm_flutter/LICENSE) file for details.
 
 ## More information
 
diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml
index fa1f4a1b..cc13a055 100644
--- a/example/azure/common-steps.yaml
+++ b/example/azure/common-steps.yaml
@@ -21,7 +21,7 @@ steps:
     displayName: Clone repository
 
   - bash: |
-      pluginVersion=$(grep "^version: [0-9\.].*$" pubspec.yaml | awk -F":" '{print $2}')
+      pluginVersion=$(grep "^version: [0-9\.].*$" situm_flutter/pubspec.yaml | awk -F":" '{print $2}')
       echo "##vso[task.setvariable variable=pluginVersion]$(echo $pluginVersion)"
       cd example
 
diff --git a/example/pubspec.lock b/example/pubspec.lock
index a2255d56..3f4bfe35 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -150,7 +150,7 @@ packages:
   situm_flutter:
     dependency: "direct main"
     description:
-      path: ".."
+      path: "../situm_flutter"
       relative: true
     source: path
     version: "3.27.40"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index a9f103b8..02bdd5f1 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -23,8 +23,8 @@ dependencies:
     #   situm_flutter: ^x.y.z
     # See https://dart.dev/tools/pub/dependencies#version-constraints
     # The example app is bundled with the plugin so we use a path dependency on
-    # the parent directory to use the current plugin's version.
-    path: ../
+    # the plugin directory to use the current plugin's version.
+    path: ../situm_flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
diff --git a/.metadata b/situm_flutter/.metadata
similarity index 100%
rename from .metadata
rename to situm_flutter/.metadata
diff --git a/CHANGELOG.md b/situm_flutter/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to situm_flutter/CHANGELOG.md
diff --git a/CHANGELOG_UNRELEASED.md b/situm_flutter/CHANGELOG_UNRELEASED.md
similarity index 100%
rename from CHANGELOG_UNRELEASED.md
rename to situm_flutter/CHANGELOG_UNRELEASED.md
diff --git a/LICENSE b/situm_flutter/LICENSE
similarity index 100%
rename from LICENSE
rename to situm_flutter/LICENSE
diff --git a/situm_flutter/README.md b/situm_flutter/README.md
new file mode 100644
index 00000000..86103c18
--- /dev/null
+++ b/situm_flutter/README.md
@@ -0,0 +1,116 @@
+<p align="center"> <img width="233" src="https://situm.com/wp-content/themes/situm/img/logo-situm.svg" style="margin-bottom:1rem" />
+<h1 align="center">@situm/flutter</h1>
+</p>
+
+<p align="center" style="text-align:center">
+
+[Situm Wayfinding](https://situm.com/wayfinding) for Flutter. Integrate plug&play navigation experience with floor plans, POIs, routes and turn-by-turn directions in no time. With the power of [Situm](https://www.situm.com/).
+
+</p>
+
+<div align="center" style="text-align:center">
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+[![Pub Version](https://img.shields.io/pub/v/situm_flutter?color=blueviolet)](https://pub.dev/packages/situm_flutter)
+[![Flutter](https://img.shields.io/badge/{/}-flutter-blueviolet)](https://flutter.dev/)
+
+</div>
+
+## Getting Started
+
+There is a comprehensive tutorial on how to set-up a new application using this plugin on the Situm [documentation page](https://situm.com/docs/a-basic-flutter-app/).
+
+Below you will find the basic steps to install and configure the plugin on your Flutter project.
+These steps have already been done for you in the example application of this repository, but they are required for other projects.
+
+## Running the example
+
+Check the [example/README](https://github.com/situmtech/flutter/tree/master/example) file of this repository to create your first Flutter application using Situm Flutter.
+
+## Configure the plugin on your Flutter project
+
+### Install the plugin
+
+To add the Situm dependency to your Flutter project, you can use the `flutter pub add` command. To add this dependency to your project, you can use the following command in your terminal:
+
+```
+flutter pub add situm_flutter
+```
+
+### Set up your Situm credentials
+
+Create a new `config.dart` file with your Situm credentials. You can use the contents of [`example/config.dart.example`](https://github.com/situmtech/flutter/blob/master/example/lib/config.dart.example) as example.
+
+Follow the [Wayfinding guide](https://situm.com/docs/first-steps-for-wayfinding/) if you haven't set
+up a Situm account.
+
+### Android
+
+1. Add the `ACCESS_FINE_LOCATION` permission to your `AndroidManifest.xml` file if you have configured Situm SDK to [use GPS](<https://developers.situm.com/sdk_documentation/android/javadoc/latest/es/situm/sdk/location/locationrequest#useGps()>):
+
+```xml
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+```
+
+2. Set the `minSdkVersion` to 21 or later on your app's `build.gradle` file.
+
+### iOS
+
+1. Remove the "use_frameworks!" directive in the `Podfile` of your iOS project:
+
+2. Run `pod install` or `pod update` to bring the dependencies to your project.
+
+3. Declare the following permissions in your app's `Info.plist` file to successfully start positioning:
+
+```
+<key>NSLocationWhenInUseUsageDescription</key>
+<string>Location is required to find out where you are</string>
+<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+<string>Location is required to find out where you are</string>
+<key>NSMotionUsageDescription</key>
+<string>We use your phone sensors (giroscope, accelerometer and altimeter) to improve location quality</string>
+```
+
+4. For offline support you will have to add the underlying web application's domain inside the entry `WKAppBoundDomains` on `Info.plist` as follows:
+
+```
+<key>WKAppBoundDomains</key>
+<array>
+	<string>map-viewer.situm.com</string>
+</array>
+```
+
+## Migrate from the old [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding)
+
+The new Situm Flutter package breaks compatibility with the previous [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding).
+Integrating the new version is simpler and more straightforward. If you want to migrate your application, follow the steps described in the [Situm documentation](https://situm.com/docs/flutter-wayfinding-migration-guide).
+
+## Versioning
+
+Please refer to [CHANGELOG.md](./CHANGELOG.md) for a list of notable changes for each version of the plugin.
+
+You can also see the [tags on this repository](./tags).
+
+---
+
+## Submitting contributions
+
+You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://situm.com/contributions/).
+
+---
+
+## License
+
+This project is licensed under the MIT - see the [LICENSE](./LICENSE) file for further details.
+
+---
+
+## More information
+
+More info is available at our [Developers Page](https://situm.com/docs/01-introduction/).
+
+---
+
+## Support information
+
+For any question or bug report, please send an email to [support@situm.com](mailto:support@situm.com)
diff --git a/analysis_options.yaml b/situm_flutter/analysis_options.yaml
similarity index 100%
rename from analysis_options.yaml
rename to situm_flutter/analysis_options.yaml
diff --git a/android/.gitignore b/situm_flutter/android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to situm_flutter/android/.gitignore
diff --git a/android/build.gradle b/situm_flutter/android/build.gradle
similarity index 100%
rename from android/build.gradle
rename to situm_flutter/android/build.gradle
diff --git a/android/settings.gradle b/situm_flutter/android/settings.gradle
similarity index 100%
rename from android/settings.gradle
rename to situm_flutter/android/settings.gradle
diff --git a/android/src/main/AndroidManifest.xml b/situm_flutter/android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/src/main/AndroidManifest.xml
rename to situm_flutter/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt
diff --git a/android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt b/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt
similarity index 100%
rename from android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt
rename to situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt
diff --git a/ios/.gitignore b/situm_flutter/ios/.gitignore
similarity index 100%
rename from ios/.gitignore
rename to situm_flutter/ios/.gitignore
diff --git a/ios/Assets/.gitkeep b/situm_flutter/ios/Assets/.gitkeep
similarity index 100%
rename from ios/Assets/.gitkeep
rename to situm_flutter/ios/Assets/.gitkeep
diff --git a/ios/situm_flutter.podspec b/situm_flutter/ios/situm_flutter.podspec
similarity index 84%
rename from ios/situm_flutter.podspec
rename to situm_flutter/ios/situm_flutter.podspec
index ea2836de..4e9af10e 100644
--- a/ios/situm_flutter.podspec
+++ b/situm_flutter/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/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
similarity index 100%
rename from ios/Classes/SITFSDKPlugin.m
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
diff --git a/ios/Classes/SITFSDKUtils.m b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
similarity index 100%
rename from ios/Classes/SITFSDKUtils.m
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
diff --git a/ios/Classes/SITNavigationHandler.m b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
similarity index 100%
rename from ios/Classes/SITNavigationHandler.m
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
diff --git a/ios/Classes/SITTextToSpeechManager.m b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
similarity index 100%
rename from ios/Classes/SITTextToSpeechManager.m
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
diff --git a/ios/Classes/SitumFlutterWayfindingPlugin.m b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
similarity index 100%
rename from ios/Classes/SitumFlutterWayfindingPlugin.m
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
diff --git a/ios/Classes/SITFSDKPlugin.h b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
similarity index 100%
rename from ios/Classes/SITFSDKPlugin.h
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
diff --git a/ios/Classes/SITFSDKUtils.h b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
similarity index 100%
rename from ios/Classes/SITFSDKUtils.h
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
diff --git a/ios/Classes/SITNavigationHandler.h b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
similarity index 100%
rename from ios/Classes/SITNavigationHandler.h
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
diff --git a/ios/Classes/SITTextToSpeechManager.h b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
similarity index 100%
rename from ios/Classes/SITTextToSpeechManager.h
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
diff --git a/ios/Classes/SitumFlutterWayfindingPlugin.h b/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
similarity index 100%
rename from ios/Classes/SitumFlutterWayfindingPlugin.h
rename to situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
diff --git a/ios/Classes/situm_flutter-Bridging-Header.h b/situm_flutter/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 situm_flutter/ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h
diff --git a/lib/sdk.dart b/situm_flutter/lib/sdk.dart
similarity index 100%
rename from lib/sdk.dart
rename to situm_flutter/lib/sdk.dart
diff --git a/lib/src/adapters/location_error_adapter.dart b/situm_flutter/lib/src/adapters/location_error_adapter.dart
similarity index 100%
rename from lib/src/adapters/location_error_adapter.dart
rename to situm_flutter/lib/src/adapters/location_error_adapter.dart
diff --git a/lib/src/adapters/location_status_adapter.dart b/situm_flutter/lib/src/adapters/location_status_adapter.dart
similarity index 100%
rename from lib/src/adapters/location_status_adapter.dart
rename to situm_flutter/lib/src/adapters/location_status_adapter.dart
diff --git a/lib/src/controller.dart b/situm_flutter/lib/src/controller.dart
similarity index 100%
rename from lib/src/controller.dart
rename to situm_flutter/lib/src/controller.dart
diff --git a/lib/src/definitions.dart b/situm_flutter/lib/src/definitions.dart
similarity index 100%
rename from lib/src/definitions.dart
rename to situm_flutter/lib/src/definitions.dart
diff --git a/lib/src/mapper.dart b/situm_flutter/lib/src/mapper.dart
similarity index 100%
rename from lib/src/mapper.dart
rename to situm_flutter/lib/src/mapper.dart
diff --git a/lib/src/message_handlers.dart b/situm_flutter/lib/src/message_handlers.dart
similarity index 100%
rename from lib/src/message_handlers.dart
rename to situm_flutter/lib/src/message_handlers.dart
diff --git a/lib/src/sdk_controller.dart b/situm_flutter/lib/src/sdk_controller.dart
similarity index 100%
rename from lib/src/sdk_controller.dart
rename to situm_flutter/lib/src/sdk_controller.dart
diff --git a/lib/src/sdk_definitions.dart b/situm_flutter/lib/src/sdk_definitions.dart
similarity index 100%
rename from lib/src/sdk_definitions.dart
rename to situm_flutter/lib/src/sdk_definitions.dart
diff --git a/lib/src/sdk_mapper.dart b/situm_flutter/lib/src/sdk_mapper.dart
similarity index 100%
rename from lib/src/sdk_mapper.dart
rename to situm_flutter/lib/src/sdk_mapper.dart
diff --git a/lib/src/situm_map_view.dart b/situm_flutter/lib/src/situm_map_view.dart
similarity index 100%
rename from lib/src/situm_map_view.dart
rename to situm_flutter/lib/src/situm_map_view.dart
diff --git a/lib/src/ui_utils.dart b/situm_flutter/lib/src/ui_utils.dart
similarity index 100%
rename from lib/src/ui_utils.dart
rename to situm_flutter/lib/src/ui_utils.dart
diff --git a/lib/wayfinding.dart b/situm_flutter/lib/wayfinding.dart
similarity index 100%
rename from lib/wayfinding.dart
rename to situm_flutter/lib/wayfinding.dart
diff --git a/pubspec.yaml b/situm_flutter/pubspec.yaml
similarity index 100%
rename from pubspec.yaml
rename to situm_flutter/pubspec.yaml
diff --git a/test/situm_flutter_test.dart b/situm_flutter/test/situm_flutter_test.dart
similarity index 100%
rename from test/situm_flutter_test.dart
rename to situm_flutter/test/situm_flutter_test.dart

From 631207d00f68a8b4f84169ae34f6ca0f73d45d60 Mon Sep 17 00:00:00 2001
From: fsvilas <fernando.sanchez@situm.com>
Date: Wed, 15 Jul 2026 18:46:12 +0200
Subject: [PATCH 2/3] Improvements in pipelines and more

---
 azure-pipelines.yml                        |   6 +-
 example/ios/Flutter/AppFrameworkInfo.plist |   2 -
 example/ios/Podfile.lock                   |  16 +-
 example/pubspec.lock                       |  64 +++---
 situm_flutter/pubspec.lock                 | 245 +++++++++++++++++++++
 5 files changed, 287 insertions(+), 46 deletions(-)
 create mode 100644 situm_flutter/pubspec.lock

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 43ad0baf..3980ebfd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -189,7 +189,7 @@ steps:
             bitbucket_user: situmops
           system: "N/A"
           server: "github"
-          repofolder: "flutter"
+          repofolder: "flutter/situm_flutter"
           mergeBranches:
             - "master"
             - "develop"
@@ -223,7 +223,9 @@ steps:
           if [ -d "flutter" ];then
             cd flutter
           fi
-          cd situm_flutter
+          if [ -d "situm_flutter" ];then
+            cd situm_flutter
+          fi
 
           echo -e "\n[+] Publish flutter package\n"
           dart pub publish --force
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 3f4bfe35..9c6e0d59 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/situm_flutter/pubspec.lock b/situm_flutter/pubspec.lock
new file mode 100644
index 00000000..e8696649
--- /dev/null
+++ b/situm_flutter/pubspec.lock
@@ -0,0 +1,245 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.1"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.19.1"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.2"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.10"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.19"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.18.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  plugin_platform_interface:
+    dependency: "direct main"
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.2"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.1"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.2"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.11"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.2.0"
+  webview_flutter:
+    dependency: "direct main"
+    description:
+      name: webview_flutter
+      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.0"
+  webview_flutter_android:
+    dependency: "direct main"
+    description:
+      name: webview_flutter_android
+      sha256: "47a8da40d02befda5b151a26dba71f47df471cddd91dfdb7802d0a87c5442558"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.16.9"
+  webview_flutter_platform_interface:
+    dependency: "direct main"
+    description:
+      name: webview_flutter_platform_interface
+      sha256: "1221c1b12f5278791042f2ec2841743784cf25c5a644e23d6680e5d718824f04"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.15.1"
+  webview_flutter_wkwebview:
+    dependency: "direct main"
+    description:
+      name: webview_flutter_wkwebview
+      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.10.2"
+sdks:
+  dart: ">=3.10.0-0 <4.0.0"
+  flutter: ">=3.35.0"

From 02ec4d780dbf5f0ff7a9f43e1f897d6c33c58111 Mon Sep 17 00:00:00 2001
From: fsvilas <fernando.sanchez@situm.com>
Date: Fri, 17 Jul 2026 13:05:01 +0200
Subject: [PATCH 3/3] Reverse changes to move plugin to situm_flutter folder

---
 situm_flutter/.metadata => .metadata          |   0
 situm_flutter/CHANGELOG.md => CHANGELOG.md    |   0
 ...G_UNRELEASED.md => CHANGELOG_UNRELEASED.md |   0
 situm_flutter/LICENSE => LICENSE              |   0
 README.md                                     | 118 ++++++++-
 ...ysis_options.yaml => analysis_options.yaml |   0
 {situm_flutter/android => android}/.gitignore |   0
 .../android => android}/build.gradle          |   0
 .../android => android}/settings.gradle       |   0
 .../src/main/AndroidManifest.xml              |   0
 .../situm/situm_flutter/AccessibilityHack.kt  |   0
 .../com/situm/situm_flutter/AutoStop.kt       |   0
 .../com/situm/situm_flutter/Extensions.kt     |   0
 .../com/situm/situm_flutter/Navigation.kt     |   0
 .../situm/situm_flutter/SitumFlutterPlugin.kt |   0
 .../situm_flutter/TextToSpeechManager.kt      |   0
 .../situm/situm_flutter/ViewerNavigation.kt   |   0
 azure-pipelines.yml                           |  18 +-
 example/README.md                             |   6 +-
 example/azure/common-steps.yaml               |   2 +-
 example/pubspec.lock                          |   2 +-
 example/pubspec.yaml                          |   4 +-
 {situm_flutter/ios => ios}/.gitignore         |   0
 {situm_flutter/ios => ios}/Assets/.gitkeep    |   0
 .../ios => ios}/situm_flutter.podspec         |   0
 .../Sources/situm_flutter/SITFSDKPlugin.m     |   0
 .../Sources/situm_flutter/SITFSDKUtils.m      |   0
 .../situm_flutter/SITNavigationHandler.m      |   0
 .../situm_flutter/SITTextToSpeechManager.m    |   0
 .../SitumFlutterWayfindingPlugin.m            |   0
 .../include/situm_flutter/SITFSDKPlugin.h     |   0
 .../include/situm_flutter/SITFSDKUtils.h      |   0
 .../situm_flutter/SITNavigationHandler.h      |   0
 .../situm_flutter/SITTextToSpeechManager.h    |   0
 .../SitumFlutterWayfindingPlugin.h            |   0
 .../situm_flutter-Bridging-Header.h           |   0
 {situm_flutter/lib => lib}/sdk.dart           |   0
 .../src/adapters/location_error_adapter.dart  |   0
 .../src/adapters/location_status_adapter.dart |   0
 .../lib => lib}/src/controller.dart           |   0
 .../lib => lib}/src/definitions.dart          |   0
 {situm_flutter/lib => lib}/src/mapper.dart    |   0
 .../lib => lib}/src/message_handlers.dart     |   0
 .../lib => lib}/src/sdk_controller.dart       |   0
 .../lib => lib}/src/sdk_definitions.dart      |   0
 .../lib => lib}/src/sdk_mapper.dart           |   0
 .../lib => lib}/src/situm_map_view.dart       |   0
 {situm_flutter/lib => lib}/src/ui_utils.dart  |   0
 {situm_flutter/lib => lib}/wayfinding.dart    |   0
 situm_flutter/pubspec.yaml => pubspec.yaml    |   0
 situm_flutter/README.md                       | 116 ---------
 situm_flutter/pubspec.lock                    | 245 ------------------
 .../test => test}/situm_flutter_test.dart     |   0
 53 files changed, 127 insertions(+), 384 deletions(-)
 rename situm_flutter/.metadata => .metadata (100%)
 rename situm_flutter/CHANGELOG.md => CHANGELOG.md (100%)
 rename situm_flutter/CHANGELOG_UNRELEASED.md => CHANGELOG_UNRELEASED.md (100%)
 rename situm_flutter/LICENSE => LICENSE (100%)
 rename situm_flutter/analysis_options.yaml => analysis_options.yaml (100%)
 rename {situm_flutter/android => android}/.gitignore (100%)
 rename {situm_flutter/android => android}/build.gradle (100%)
 rename {situm_flutter/android => android}/settings.gradle (100%)
 rename {situm_flutter/android => android}/src/main/AndroidManifest.xml (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/Extensions.kt (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/Navigation.kt (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt (100%)
 rename {situm_flutter/android => android}/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt (100%)
 rename {situm_flutter/ios => ios}/.gitignore (100%)
 rename {situm_flutter/ios => ios}/Assets/.gitkeep (100%)
 rename {situm_flutter/ios => ios}/situm_flutter.podspec (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h (100%)
 rename {situm_flutter/ios => ios}/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h (100%)
 rename {situm_flutter/lib => lib}/sdk.dart (100%)
 rename {situm_flutter/lib => lib}/src/adapters/location_error_adapter.dart (100%)
 rename {situm_flutter/lib => lib}/src/adapters/location_status_adapter.dart (100%)
 rename {situm_flutter/lib => lib}/src/controller.dart (100%)
 rename {situm_flutter/lib => lib}/src/definitions.dart (100%)
 rename {situm_flutter/lib => lib}/src/mapper.dart (100%)
 rename {situm_flutter/lib => lib}/src/message_handlers.dart (100%)
 rename {situm_flutter/lib => lib}/src/sdk_controller.dart (100%)
 rename {situm_flutter/lib => lib}/src/sdk_definitions.dart (100%)
 rename {situm_flutter/lib => lib}/src/sdk_mapper.dart (100%)
 rename {situm_flutter/lib => lib}/src/situm_map_view.dart (100%)
 rename {situm_flutter/lib => lib}/src/ui_utils.dart (100%)
 rename {situm_flutter/lib => lib}/wayfinding.dart (100%)
 rename situm_flutter/pubspec.yaml => pubspec.yaml (100%)
 delete mode 100644 situm_flutter/README.md
 delete mode 100644 situm_flutter/pubspec.lock
 rename {situm_flutter/test => test}/situm_flutter_test.dart (100%)

diff --git a/situm_flutter/.metadata b/.metadata
similarity index 100%
rename from situm_flutter/.metadata
rename to .metadata
diff --git a/situm_flutter/CHANGELOG.md b/CHANGELOG.md
similarity index 100%
rename from situm_flutter/CHANGELOG.md
rename to CHANGELOG.md
diff --git a/situm_flutter/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
similarity index 100%
rename from situm_flutter/CHANGELOG_UNRELEASED.md
rename to CHANGELOG_UNRELEASED.md
diff --git a/situm_flutter/LICENSE b/LICENSE
similarity index 100%
rename from situm_flutter/LICENSE
rename to LICENSE
diff --git a/README.md b/README.md
index 0c85d49d..095665cf 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,116 @@
-# Situm Flutter
+<p align="center"> <img width="233" src="https://situm.com/wp-content/themes/situm/img/logo-situm.svg" style="margin-bottom:1rem" />
+<h1 align="center">@situm/flutter</h1>
+</p>
 
-This repository contains the Situm Flutter plugin and its example application.
+<p align="center" style="text-align:center">
 
-- [Plugin README](./situm_flutter/README.md)
-- [Example app](./example/README.md)
+[Situm Wayfinding](https://situm.com/wayfinding) for Flutter. Integrate plug&play navigation experience with floor plans, POIs, routes and turn-by-turn directions in no time. With the power of [Situm](https://www.situm.com/).
 
-The Flutter package is located in [`situm_flutter/`](./situm_flutter).
+</p>
+
+<div align="center" style="text-align:center">
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+[![Pub Version](https://img.shields.io/pub/v/situm_flutter?color=blueviolet)](https://pub.dev/packages/situm_flutter)
+[![Flutter](https://img.shields.io/badge/{/}-flutter-blueviolet)](https://flutter.dev/)
+
+</div>
+
+## Getting Started
+
+There is a comprehensive tutorial on how to set-up a new application using this plugin on the Situm [documentation page](https://situm.com/docs/a-basic-flutter-app/).
+
+Below you will find the basic steps to install and configure the plugin on your Flutter project.
+These steps have already been done for you in the example application of this repository, but they are required for other projects.
+
+## Running the example
+
+Check the [example/README](./example/README.md) file of this repository to create your first Flutter application using Situm Flutter.
+
+## Configure the plugin on your Flutter project
+
+### Install the plugin
+
+To add the Situm dependency to your Flutter project, you can use the `flutter pub add` command. To add this dependency to your project, you can use the following command in your terminal:
+
+```
+flutter pub add situm_flutter
+```
+
+### Set up your Situm credentials
+
+Create a new `config.dart` file with your Situm credentials. You can use the contents of `example/config.dart.example` as example.
+
+Follow the [Wayfinding guide](https://situm.com/docs/first-steps-for-wayfinding/) if you haven't set
+up a Situm account.
+
+### Android
+
+1. Add the `ACCESS_FINE_LOCATION` permission to your `AndroidManifest.xml` file if you have configured Situm SDK to [use GPS](<https://developers.situm.com/sdk_documentation/android/javadoc/latest/es/situm/sdk/location/locationrequest#useGps()>):
+
+```xml
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+```
+
+2. Set the `minSdkVersion` to 21 or later on your app's `build.gradle` file.
+
+### iOS
+
+1. Remove the "use_frameworks!" directive in the `Podfile` of your iOS project:
+
+2. Run `pod install` or `pod update` to bring the dependencies to your project.
+
+3. Declare the following permissions in your app's `Info.plist` file to successfully start positioning:
+
+```
+<key>NSLocationWhenInUseUsageDescription</key>
+<string>Location is required to find out where you are</string>
+<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+<string>Location is required to find out where you are</string>
+<key>NSMotionUsageDescription</key>
+<string>We use your phone sensors (giroscope, accelerometer and altimeter) to improve location quality</string>
+```
+
+4. For offline support you will have to add the underlying web application's domain inside the entry `WKAppBoundDomains` on `Info.plist` as follows:
+
+```
+<key>WKAppBoundDomains</key>
+<array>
+	<string>map-viewer.situm.com</string>
+</array>
+```
+
+## Migrate from the old [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding)
+
+The new Situm Flutter package breaks compatibility with the previous [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding).
+Integrating the new version is simpler and more straightforward. If you want to migrate your application, follow the steps described in the [Situm documentation](https://situm.com/docs/flutter-wayfinding-migration-guide).
+
+## Versioning
+
+Please refer to [CHANGELOG.md](./CHANGELOG.md) for a list of notable changes for each version of the plugin.
+
+You can also see the [tags on this repository](./tags).
+
+---
+
+## Submitting contributions
+
+You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://situm.com/contributions/).
+
+---
+
+## License
+
+This project is licensed under the MIT - see the [LICENSE](./LICENSE) file for further details.
+
+---
+
+## More information
+
+More info is available at our [Developers Page](https://situm.com/docs/01-introduction/).
+
+---
+
+## Support information
+
+For any question or bug report, please send an email to [support@situm.com](mailto:support@situm.com)
diff --git a/situm_flutter/analysis_options.yaml b/analysis_options.yaml
similarity index 100%
rename from situm_flutter/analysis_options.yaml
rename to analysis_options.yaml
diff --git a/situm_flutter/android/.gitignore b/android/.gitignore
similarity index 100%
rename from situm_flutter/android/.gitignore
rename to android/.gitignore
diff --git a/situm_flutter/android/build.gradle b/android/build.gradle
similarity index 100%
rename from situm_flutter/android/build.gradle
rename to android/build.gradle
diff --git a/situm_flutter/android/settings.gradle b/android/settings.gradle
similarity index 100%
rename from situm_flutter/android/settings.gradle
rename to android/settings.gradle
diff --git a/situm_flutter/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
similarity index 100%
rename from situm_flutter/android/src/main/AndroidManifest.xml
rename to android/src/main/AndroidManifest.xml
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt b/android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/AccessibilityHack.kt
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt b/android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/AutoStop.kt
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt b/android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/Extensions.kt
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt b/android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/Navigation.kt
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt b/android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/SitumFlutterPlugin.kt
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt b/android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/TextToSpeechManager.kt
diff --git a/situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt b/android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt
similarity index 100%
rename from situm_flutter/android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt
rename to android/src/main/kotlin/com/situm/situm_flutter/ViewerNavigation.kt
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3980ebfd..ae61ff1b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,7 +68,6 @@ steps:
           echo -e "\n[+] Get Dependencies\n"
           echo -e "##[command] flutter pub get \n"
 
-          cd situm_flutter
           flutter pub get
         displayName: Get Dependencies
 
@@ -167,9 +166,9 @@ steps:
           git checkout $(currentBranch)
 
           echo -e "\n[+] Change version in pubspec.yaml\n"
-          sed "s/^version:\s[0-9].*$/version: $(version)/g" -i situm_flutter/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 situm_flutter/ios/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"
           cd example
           flutter pub get
@@ -189,7 +188,7 @@ steps:
             bitbucket_user: situmops
           system: "N/A"
           server: "github"
-          repofolder: "flutter/situm_flutter"
+          repofolder: "flutter"
           mergeBranches:
             - "master"
             - "develop"
@@ -223,9 +222,6 @@ steps:
           if [ -d "flutter" ];then
             cd flutter
           fi
-          if [ -d "situm_flutter" ];then
-            cd situm_flutter
-          fi
 
           echo -e "\n[+] Publish flutter package\n"
           dart pub publish --force
@@ -244,15 +240,15 @@ steps:
           git checkout master
           git pull origin master
 
-          iossdk=$(grep -i situmsdk situm_flutter/ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
-          androidsdk=$(grep situm-sdk situm_flutter/android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          iossdk=$(grep -i situmsdk ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          androidsdk=$(grep situm-sdk android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
 
           echo -e "\n[+] Checkout to previous commit\n"
           git checkout HEAD~1
 
 
-          iossdk_old=$(grep -i situmsdk situm_flutter/ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
-          androidsdk_old=$(grep situm-sdk situm_flutter/android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          iossdk_old=$(grep -i situmsdk ios/situm_flutter.podspec | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+          androidsdk_old=$(grep situm-sdk android/build.gradle | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
 
           echo -e "\n[+] Return repository to master branch\n"
           git checkout master
diff --git a/example/README.md b/example/README.md
index 15fe1cc6..8d53b7a6 100644
--- a/example/README.md
+++ b/example/README.md
@@ -4,7 +4,7 @@
 
 <div align="center" style="text-align:center">
 
-A sample Flutter application to start learning the power of [Situm Flutter Plugin](../situm_flutter/README.md).
+A sample Flutter application to start learning the power of [Situm Flutter Plugin](../README.md).
 
 </div>
 
@@ -92,7 +92,7 @@ In case you want to learn how to use our plugin, you may want to take a look at
 
 We use [SemVer](http://semver.org/) for versioning.
 
-Please refer to [CHANGELOG.md](../situm_flutter/CHANGELOG.md) for a list of notables changes for each version of the library.
+Please refer to [CHANGELOG.md](../CHANGELOG.md) for a list of notables changes for each version of the library.
 
 You can also see the [tags on this repository](https://github.com/situmtech/flutter-wayfinding/tags).
 
@@ -102,7 +102,7 @@ You will need to sign a Contributor License Agreement (CLA) before making a subm
 
 ## License
 
-This project is licensed under the MIT - see the [LICENSE](../situm_flutter/LICENSE) file for details.
+This project is licensed under the MIT - see the [LICENSE](../LICENSE) file for details.
 
 ## More information
 
diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml
index cc13a055..fa1f4a1b 100644
--- a/example/azure/common-steps.yaml
+++ b/example/azure/common-steps.yaml
@@ -21,7 +21,7 @@ steps:
     displayName: Clone repository
 
   - bash: |
-      pluginVersion=$(grep "^version: [0-9\.].*$" situm_flutter/pubspec.yaml | awk -F":" '{print $2}')
+      pluginVersion=$(grep "^version: [0-9\.].*$" pubspec.yaml | awk -F":" '{print $2}')
       echo "##vso[task.setvariable variable=pluginVersion]$(echo $pluginVersion)"
       cd example
 
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 9c6e0d59..e32c79dd 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -150,7 +150,7 @@ packages:
   situm_flutter:
     dependency: "direct main"
     description:
-      path: "../situm_flutter"
+      path: ".."
       relative: true
     source: path
     version: "3.27.40"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 02bdd5f1..a9f103b8 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -23,8 +23,8 @@ dependencies:
     #   situm_flutter: ^x.y.z
     # See https://dart.dev/tools/pub/dependencies#version-constraints
     # The example app is bundled with the plugin so we use a path dependency on
-    # the plugin directory to use the current plugin's version.
-    path: ../situm_flutter
+    # the parent directory to use the current plugin's version.
+    path: ../
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
diff --git a/situm_flutter/ios/.gitignore b/ios/.gitignore
similarity index 100%
rename from situm_flutter/ios/.gitignore
rename to ios/.gitignore
diff --git a/situm_flutter/ios/Assets/.gitkeep b/ios/Assets/.gitkeep
similarity index 100%
rename from situm_flutter/ios/Assets/.gitkeep
rename to ios/Assets/.gitkeep
diff --git a/situm_flutter/ios/situm_flutter.podspec b/ios/situm_flutter.podspec
similarity index 100%
rename from situm_flutter/ios/situm_flutter.podspec
rename to ios/situm_flutter.podspec
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m b/ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
rename to ios/situm_flutter/Sources/situm_flutter/SITFSDKPlugin.m
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m b/ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
rename to ios/situm_flutter/Sources/situm_flutter/SITFSDKUtils.m
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m b/ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
rename to ios/situm_flutter/Sources/situm_flutter/SITNavigationHandler.m
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m b/ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
rename to ios/situm_flutter/Sources/situm_flutter/SITTextToSpeechManager.m
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m b/ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
rename to ios/situm_flutter/Sources/situm_flutter/SitumFlutterWayfindingPlugin.m
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKPlugin.h
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITFSDKUtils.h
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITNavigationHandler.h
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SITTextToSpeechManager.h
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h b/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
rename to ios/situm_flutter/Sources/situm_flutter/include/situm_flutter/SitumFlutterWayfindingPlugin.h
diff --git a/situm_flutter/ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h b/ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h
similarity index 100%
rename from situm_flutter/ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h
rename to ios/situm_flutter/Sources/situm_flutter/situm_flutter-Bridging-Header.h
diff --git a/situm_flutter/lib/sdk.dart b/lib/sdk.dart
similarity index 100%
rename from situm_flutter/lib/sdk.dart
rename to lib/sdk.dart
diff --git a/situm_flutter/lib/src/adapters/location_error_adapter.dart b/lib/src/adapters/location_error_adapter.dart
similarity index 100%
rename from situm_flutter/lib/src/adapters/location_error_adapter.dart
rename to lib/src/adapters/location_error_adapter.dart
diff --git a/situm_flutter/lib/src/adapters/location_status_adapter.dart b/lib/src/adapters/location_status_adapter.dart
similarity index 100%
rename from situm_flutter/lib/src/adapters/location_status_adapter.dart
rename to lib/src/adapters/location_status_adapter.dart
diff --git a/situm_flutter/lib/src/controller.dart b/lib/src/controller.dart
similarity index 100%
rename from situm_flutter/lib/src/controller.dart
rename to lib/src/controller.dart
diff --git a/situm_flutter/lib/src/definitions.dart b/lib/src/definitions.dart
similarity index 100%
rename from situm_flutter/lib/src/definitions.dart
rename to lib/src/definitions.dart
diff --git a/situm_flutter/lib/src/mapper.dart b/lib/src/mapper.dart
similarity index 100%
rename from situm_flutter/lib/src/mapper.dart
rename to lib/src/mapper.dart
diff --git a/situm_flutter/lib/src/message_handlers.dart b/lib/src/message_handlers.dart
similarity index 100%
rename from situm_flutter/lib/src/message_handlers.dart
rename to lib/src/message_handlers.dart
diff --git a/situm_flutter/lib/src/sdk_controller.dart b/lib/src/sdk_controller.dart
similarity index 100%
rename from situm_flutter/lib/src/sdk_controller.dart
rename to lib/src/sdk_controller.dart
diff --git a/situm_flutter/lib/src/sdk_definitions.dart b/lib/src/sdk_definitions.dart
similarity index 100%
rename from situm_flutter/lib/src/sdk_definitions.dart
rename to lib/src/sdk_definitions.dart
diff --git a/situm_flutter/lib/src/sdk_mapper.dart b/lib/src/sdk_mapper.dart
similarity index 100%
rename from situm_flutter/lib/src/sdk_mapper.dart
rename to lib/src/sdk_mapper.dart
diff --git a/situm_flutter/lib/src/situm_map_view.dart b/lib/src/situm_map_view.dart
similarity index 100%
rename from situm_flutter/lib/src/situm_map_view.dart
rename to lib/src/situm_map_view.dart
diff --git a/situm_flutter/lib/src/ui_utils.dart b/lib/src/ui_utils.dart
similarity index 100%
rename from situm_flutter/lib/src/ui_utils.dart
rename to lib/src/ui_utils.dart
diff --git a/situm_flutter/lib/wayfinding.dart b/lib/wayfinding.dart
similarity index 100%
rename from situm_flutter/lib/wayfinding.dart
rename to lib/wayfinding.dart
diff --git a/situm_flutter/pubspec.yaml b/pubspec.yaml
similarity index 100%
rename from situm_flutter/pubspec.yaml
rename to pubspec.yaml
diff --git a/situm_flutter/README.md b/situm_flutter/README.md
deleted file mode 100644
index 86103c18..00000000
--- a/situm_flutter/README.md
+++ /dev/null
@@ -1,116 +0,0 @@
-<p align="center"> <img width="233" src="https://situm.com/wp-content/themes/situm/img/logo-situm.svg" style="margin-bottom:1rem" />
-<h1 align="center">@situm/flutter</h1>
-</p>
-
-<p align="center" style="text-align:center">
-
-[Situm Wayfinding](https://situm.com/wayfinding) for Flutter. Integrate plug&play navigation experience with floor plans, POIs, routes and turn-by-turn directions in no time. With the power of [Situm](https://www.situm.com/).
-
-</p>
-
-<div align="center" style="text-align:center">
-
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-[![Pub Version](https://img.shields.io/pub/v/situm_flutter?color=blueviolet)](https://pub.dev/packages/situm_flutter)
-[![Flutter](https://img.shields.io/badge/{/}-flutter-blueviolet)](https://flutter.dev/)
-
-</div>
-
-## Getting Started
-
-There is a comprehensive tutorial on how to set-up a new application using this plugin on the Situm [documentation page](https://situm.com/docs/a-basic-flutter-app/).
-
-Below you will find the basic steps to install and configure the plugin on your Flutter project.
-These steps have already been done for you in the example application of this repository, but they are required for other projects.
-
-## Running the example
-
-Check the [example/README](https://github.com/situmtech/flutter/tree/master/example) file of this repository to create your first Flutter application using Situm Flutter.
-
-## Configure the plugin on your Flutter project
-
-### Install the plugin
-
-To add the Situm dependency to your Flutter project, you can use the `flutter pub add` command. To add this dependency to your project, you can use the following command in your terminal:
-
-```
-flutter pub add situm_flutter
-```
-
-### Set up your Situm credentials
-
-Create a new `config.dart` file with your Situm credentials. You can use the contents of [`example/config.dart.example`](https://github.com/situmtech/flutter/blob/master/example/lib/config.dart.example) as example.
-
-Follow the [Wayfinding guide](https://situm.com/docs/first-steps-for-wayfinding/) if you haven't set
-up a Situm account.
-
-### Android
-
-1. Add the `ACCESS_FINE_LOCATION` permission to your `AndroidManifest.xml` file if you have configured Situm SDK to [use GPS](<https://developers.situm.com/sdk_documentation/android/javadoc/latest/es/situm/sdk/location/locationrequest#useGps()>):
-
-```xml
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-```
-
-2. Set the `minSdkVersion` to 21 or later on your app's `build.gradle` file.
-
-### iOS
-
-1. Remove the "use_frameworks!" directive in the `Podfile` of your iOS project:
-
-2. Run `pod install` or `pod update` to bring the dependencies to your project.
-
-3. Declare the following permissions in your app's `Info.plist` file to successfully start positioning:
-
-```
-<key>NSLocationWhenInUseUsageDescription</key>
-<string>Location is required to find out where you are</string>
-<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-<string>Location is required to find out where you are</string>
-<key>NSMotionUsageDescription</key>
-<string>We use your phone sensors (giroscope, accelerometer and altimeter) to improve location quality</string>
-```
-
-4. For offline support you will have to add the underlying web application's domain inside the entry `WKAppBoundDomains` on `Info.plist` as follows:
-
-```
-<key>WKAppBoundDomains</key>
-<array>
-	<string>map-viewer.situm.com</string>
-</array>
-```
-
-## Migrate from the old [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding)
-
-The new Situm Flutter package breaks compatibility with the previous [Situm Flutter Wayfinding plugin](https://pub.dev/packages/situm_flutter_wayfinding).
-Integrating the new version is simpler and more straightforward. If you want to migrate your application, follow the steps described in the [Situm documentation](https://situm.com/docs/flutter-wayfinding-migration-guide).
-
-## Versioning
-
-Please refer to [CHANGELOG.md](./CHANGELOG.md) for a list of notable changes for each version of the plugin.
-
-You can also see the [tags on this repository](./tags).
-
----
-
-## Submitting contributions
-
-You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://situm.com/contributions/).
-
----
-
-## License
-
-This project is licensed under the MIT - see the [LICENSE](./LICENSE) file for further details.
-
----
-
-## More information
-
-More info is available at our [Developers Page](https://situm.com/docs/01-introduction/).
-
----
-
-## Support information
-
-For any question or bug report, please send an email to [support@situm.com](mailto:support@situm.com)
diff --git a/situm_flutter/pubspec.lock b/situm_flutter/pubspec.lock
deleted file mode 100644
index e8696649..00000000
--- a/situm_flutter/pubspec.lock
+++ /dev/null
@@ -1,245 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.1"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.0.2"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.10"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.19"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.13.0"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  plugin_platform_interface:
-    dependency: "direct main"
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.2"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.11"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360"
-      url: "https://pub.dev"
-    source: hosted
-    version: "15.2.0"
-  webview_flutter:
-    dependency: "direct main"
-    description:
-      name: webview_flutter
-      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.0"
-  webview_flutter_android:
-    dependency: "direct main"
-    description:
-      name: webview_flutter_android
-      sha256: "47a8da40d02befda5b151a26dba71f47df471cddd91dfdb7802d0a87c5442558"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.16.9"
-  webview_flutter_platform_interface:
-    dependency: "direct main"
-    description:
-      name: webview_flutter_platform_interface
-      sha256: "1221c1b12f5278791042f2ec2841743784cf25c5a644e23d6680e5d718824f04"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.15.1"
-  webview_flutter_wkwebview:
-    dependency: "direct main"
-    description:
-      name: webview_flutter_wkwebview
-      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.10.2"
-sdks:
-  dart: ">=3.10.0-0 <4.0.0"
-  flutter: ">=3.35.0"
diff --git a/situm_flutter/test/situm_flutter_test.dart b/test/situm_flutter_test.dart
similarity index 100%
rename from situm_flutter/test/situm_flutter_test.dart
rename to test/situm_flutter_test.dart