diff --git a/.github/ISSUE_TEMPLATE/1-bug.yml b/.github/ISSUE_TEMPLATE/1-bug.yml
index 31a4adce..09b27556 100644
--- a/.github/ISSUE_TEMPLATE/1-bug.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug.yml
@@ -7,7 +7,6 @@ body:
     attributes:
       label: Platforms
       description: On what platforms does the bug happen?
-      placeholder: 
       options: [ "Please Select", "Android", "iOS", "Web", "MacOS", "Windows", "Linux", "All" ]
     validations:
       required: true
diff --git a/.github/codecov.yml b/.github/codecov.yml
index 54de10a4..e1eeba4f 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -7,7 +7,7 @@ comment:
 
 ignore:
   - "**/*.g.dart"
-  - "lib/src/platform/android/jni/**"
+  - "maplibre/lib/src/platform/android/jni/**"
   - "example/**"
   - "maplibre_ios/**"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 450817da..ed74a5be 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,6 +82,9 @@ jobs:
       matrix:
         sdk: [ '' ] # option to use a matrix test with the lower supported flutter version
     timeout-minutes: 30
+    defaults:
+      run:
+        working-directory: maplibre
     steps:
       - uses: actions/checkout@v5
       - name: "Setup Flutter SDK"
@@ -165,6 +168,9 @@ jobs:
   score:
     name: "Package score"
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: maplibre
     steps:
       - name: Checkout project
         uses: actions/checkout@v5
@@ -286,10 +292,11 @@ jobs:
         with:
           cache: true
       - name: "Get Flutter dependencies"
-        working-directory: example
         run: dart pub get
       - name: Run pigeon
-        run: ./pigeons/run_code_gen.sh
+        run: sh ./pigeons/run_code_gen.sh
+      - name: Format code
+        run: dart format .
       - name: Check changes
         run: |
           if [[ -n "$(git status --porcelain)" ]]; then
@@ -313,15 +320,15 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       - name: "Get Flutter dependencies"
-        working-directory: example
         run: dart pub get
       - name: Build example APK
         working-directory: example
         run: flutter build apk
       - name: Run jnigen
-        run: ./run_jnigen.sh
+        working-directory: maplibre
+        run: sh ./run_jnigen.sh
       - name: Format code
-        run: dart format lib/src/platform/android/jni
+        run: dart format maplibre/lib/src/platform/android/jni
       - name: Check changes
         run: |
           if [[ -n "$(git status --porcelain)" ]]; then
diff --git a/.pubignore b/.pubignore
deleted file mode 100644
index 36253cf1..00000000
--- a/.pubignore
+++ /dev/null
@@ -1,3 +0,0 @@
-docs/
-example/assets/
-pigeons/
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index a7113286..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,317 +0,0 @@
-## 0.3.1
-
-This release brings a couple of new features and bug fixes.
-The android platform view creation has been migrated to Dart. Android is now
-completely free from method channels.
-
-### New Features
-
-- Add `minZoom`, `maxZoom` to layers.
-- Bump MapLibre Native on Android to 12.0.+.
-- Migrate android platform view creation to Dart.
-- Throw exception if layer or source id already exists when adding
-  programmatically.
-- Add `aboveLayerId` and `atIndex` to `addLayer()`.
-- Add `addImages()` to `StyleController` to add multiple images at once.
-- Add `addImageFromAssets()` to load an image from Flutter assets.
-- Add `addImageFromIconData` to add an image from Flutter icons.
-
-### Bug Fixes
-
-- Fix `allowInteraction` parameter in `WidgetLayer` not working on web.
-- Fix pub.dev score.
-- Fix `maxBounds` parameter
-- Fix `linePattern` int array causing crash on iOS.
-
-Full
-Changelog: [v0.3.0...v0.3.1](https://github.com/josxha/flutter-maplibre/compare/v0.3.0...v0.3.1)
-
-## 0.3.0
-
-In this release, I'm blazed to finally announce support for iOS.
-Similar to our other platforms, iOS uses FFI to natively interop between Dart
-and Swift/ObjC. Checkout
-the [iOS documentation](https://flutter-maplibre.pages.dev/docs/getting-started/setup-ios)
-to get started.
-A big thanks to @mhernz, @gabbopalma and @jt274 that helped with their awesome
-contributions in this release!
-
-This release introduces breaking changes. Head over to
-the [migration guide](https://flutter-maplibre.pages.dev/docs/upgrade) to learn
-more on how to update your implementation.
-
-### New Features
-
-- **Breaking** Require Flutter 3.35
-- **Breaking** Migrate from `geotypes`
-  to [geobase](https://pub.dev/packages/geobase).
-- **Breaking** Return logical pixels in events on all platforms.
-- **Breaking** Add `screenPoint` parameter to `MapEventUserInput` events to show
-  the screen coordinates in logical pixels where the user interacted with the
-  map.
-- **Breaking** Rename `rotationDuration` in `MapCompass` to
-  `nativeRotationDuration`.
-- **Breaking** Multiple `MapController` functions are now called synchronously,
-  their `*Sync()` overloads have been removed.
-- **Breaking** All declarative layers now require a `FeatureCollection`. This
-  allows users to add properties to their layers.
-- Add iOS as supported platform with MapLibre Native iOS 6.19.
-- Update MapLibre Native Android to 11.13
-- Load map styles from Flutter assets, a JSON string or via URI.
-- Add `setStyle()`, to know when the map style has loaded, listen to
-  `onStyleLoaded()`.
-- Add support for PMTiles on the web.
-- Add `androidTranslucentTextureSurface` and `androidForegroundLoadColor` to use
-  a translucent map.
-- Add `MapScalebar.units` to support imperial units in the scalebar.
-- Add `featuresAtPoint()` and `featuresInRect()` to `MapController`.
-- Update to `pigeon` 26.0.0
-
-### Bug Fixes
-
-- Fix missing export of `BearingRenderMode`
-- Remove `dart:io` import to fix pub.dev WASM compatibility detection
-
-Full
-Changelog: [v0.2.2...v0.3.0](https://github.com/josxha/flutter-maplibre/compare/v0.2.2...v0.3.0)
-
-## 0.2.2
-
-Maintenance release and some new functionality.
-Thanks for your contribution in this release @jt274!
-
-### New Features
-
-- Migrate `requestLocationPermissions()` and `addLayer()` to use JNI
-- Update `jni` and `jnigen` to v0.14
-- Update `pigeon` to v25
-- Migrate gradle DSL to Kotlin
-- Add `LngLatBounds.fromPoints()` constructor.
-
-...and numerous other dependencies updated in this release.
-
-Full
-Changelog: [v0.2.1...v0.2.2](https://github.com/josxha/flutter-maplibre/compare/v0.2.1...v0.2.2)
-
-## 0.2.1
-
-This release builds upon the long anticipated merged threads in Flutter 3.29.0
-which removes the need of switching threads. Furthermore, the release contains a
-couple of features and new fixes.
-
-Thanks for your contributions for this release, @felix-larsen and @pamtbaau!
-
-### New Features
-
-- Upgrade MapLibre Native on Android
-  to [11.8.0](https://github.com/maplibre/maplibre-native/blob/main/platform/android/CHANGELOG.md#1180)
-  which introduces support for PMTiles.
-- Add `removePinchOnPressed` and `webRotationSpeed` as parameters to the
-  `MapCompass` widget.
-- Allow the `SourceAttribution` widget to use multiple lines for its
-  attributions.
-- Underline an attribution link for a `SourceAttribution` widget when hovered
-  with a cursor.
-- Add the parameter `allowInteraction` to the `WidgetLayer` that allows widgets
-  to detect gestures on these widgets.
-- Reintroduce awaitable `moveCamera()`, `animateCamera()` and `fitCamera()` on
-  Android.
-- Use synchronous JNI calls on Android to prevent thread hopping.
-
-### Bug Fixes
-
-- Fix exceptions when the map widget rebuilds a lot in a short amount of time.
-- Fix `moveCamera()`, `animateCamera()` and `fitCamera()` does not ignore null
-  parameters.
-- Fix app freeze on Android using Flutter 3.29.0 caused by the merged threads.
-- Fix exception when adding a RasterSource programatically.
-
-### Misc
-
-- Update examples and documentation.
-- Set minimum Flutter version
-  to [3.29.0](https://discord.com/channels/951867686378409984/951879268227485707/1339719764574081148)
-  and minimum Dart version
-  to [3.7.0](https://discord.com/channels/951867686378409984/951879268227485707/1339719747981545485).
-- Use the new code formatting.
-- Upgrade pigeon to 24.
-
-Full
-Changelog: [v0.2.0...v0.2.1](https://github.com/josxha/flutter-maplibre/compare/v0.2.0...v0.2.1)
-
-## 0.2.0
-
-This release is a collection of user affecting changes along a couple of new
-features and bug fixes.
-Head over to
-the [migration guide](https://flutter-maplibre.pages.dev/docs/upgrade) to learn
-more on how to update your implementation.
-
-A big thanks to @gabbopalma for his contributions in this release.
-
-### Breaking Changes
-
-- Rename the `Layer` postfix of the more low level style classes
-  to `StyleLayer`.
-- Remove web-only map controls (ScaleControl, GeolocateControl,
-  AttributionControl, FullscreenControl, LogoControl, NavigationControl,
-  TerrainControl).
-- Remove MapLibre Native specific User Interface options (logo, attribution,
-  compass).
-- Rename `ZoomButtons` to `ControlButtons`.
-- Move style related controller calls to the `StyleController` that can be
-  accessed via a nullable `mapController.style` field.
-- Return the `StyleController` in the `onStyleLoaded()` callback and in
-  the `MapEventStyleLoaded` event.
-- An `ImageSource` now requires a static typed `LngLatQuad` object.
-- Set the minimum required Flutter version to 3.27.
-
-### New Features
-
-- Bump MapLibre Native on Android to 11.7.+.
-- Bump MapLibre GL JS on Web to version 5.
-- Add `style.setProjection()` to switch to globe projection programmatically.
-- Add a user location button to the `ControlButtons`.
-- Bump ktlint to 0.4.19 and gradle to 8.6.1.
-- Bump jni and jnigen to 0.13.0 and migrate bindings.
-- Widen the gradle dependency constraints to allow patch updates.
-- Add logo as pub.dev screenshot.
-- Structure the API docs in topics.
-- Add an internal `WidgetStateNative` for better code reuse in the upcoming iOS
-  release.
-
-## Bug Fixes
-
-- Fix can't rotate with two fingers on web.
-- Fix text overflow in the scale bar widget.
-- Fix deprecations introduced in Flutter 3.27.
-
-## Misc
-
-- Enhance documentation.
-- Build example app with java 21
-
-Full
-Changelog: [v0.1.2...v0.2.0](https://github.com/josxha/flutter-maplibre/compare/v0.1.2...v0.2.0)
-
-## 0.1.2
-
-This release adds the last missing features for Android and Web, that are were
-planned for now. The package will continue its ongoing efforts for stability
-before iOS gets added as a supported platform.
-
-### New Features
-
-- Add `OfflineManager` for offline maps, cache management and bulk downloading.
-- Add `PermissionsManager` to check and request location permissions.
-- Add `WidgetLayer` to support widgets as Markers on the map.
-- Add alternative Flutter platform view options for Texture Layer Hybrid
-  Composition, Hybrid Composition, Virtual Display.
-- Bump MapLibre Native on Android to version `11.6.+`.
-- Add web-only controller functions `toScreenLocationSync()`,
-  `toLngLatSync()`, `toScreenLocationsSync()`, `toLngLatsSync()`,
-  `getMetersPerPixelAtLatitudeSync()` and `getVisibleRegionSync()`.
-- Add `MapOptions.of(context)` and `MapOptions.maybeOf(context)`.
-- Add `padding` and `alignment` parameters to the `MapScalebar` widget.
-
-### Bug Fixes
-
-- Fix WebAssembly builds.
-- Remove unused `flutter_markdown` package.
-
-### Misc
-
-- Add unit tests, add Android integration tests.
-- Use [codecov](https://app.codecov.io/gh/josxha/flutter-maplibre) to monitor
-  test coverage.
-- Improve file structure by using a `/platform` directory.
-
-Full
-Changelog: [v0.1.1...v0.1.2](https://github.com/josxha/flutter-maplibre/compare/v0.1.1...v0.1.2)
-
-## 0.1.1
-
-### New Features
-
-- Add `controller.queryLayers()` to check what layers have been clicked.
-- Add scalebar, zoom buttons, compass and attribution widgets as a unified user
-  interface.
-- Improve hash distribution
-- Add `MapOptions` parameters to toggle platform specific UIs.
-
-### Bug Fixes
-
-- Fix `controller.getVisibleRegion()` throws exception on Android.
-
-Full
-Changelog: [v0.1.0...v0.1.1](https://github.com/josxha/flutter-maplibre/compare/v0.1.0...v0.1.1)
-
-## 0.1.0
-
-### Breaking Changes
-
-- Use a "Web" prefix for all web-only controls, for
-  example `WebGeolocateControl`.
-- Rename web-only `MapOptions.controls` to `MapOptions.webControls`.
-- Rename `jumpTo()` to `moveCamera()` and `flyTo()` to `animateCamera()`.
-- Add `init` prefix to not modifiable `MapOptions` parameters.
-- Remove click callbacks in favor of the event system.
-- Bump minimum Flutter version
-  to [3.24.0](https://medium.com/flutter/whats-new-in-flutter-3-24-6c040f87d1e4)
-  (Minimum Dart version
-  of [3.5.0](https://medium.com/dartlang/dart-3-5-6ca36259fa2f)).
-- Can't await the end of `animateCamera()` in this version.
-
-Read the [Upgrade Guide](https://flutter-maplibre.pages.dev/docs/upgrade) for
-instructions on how to upgrade.
-
-### New Features
-
-- Bump MapLibre Android SDK
-  to [11.5.1](https://github.com/maplibre/maplibre-native/releases/tag/android-v11.5.1).
-- Add high level `AnnotationLayer`s as easy to use annotations.
-- Use [jnigen](https://pub.dev/packages/jnigen) for direct interop with Java.
-- Add user location to the map.
-- Check Style for Kotlin
-
-Full
-Changelog: [v0.0.2...v0.1.0](https://github.com/josxha/flutter-maplibre/compare/v0.0.2...v0.1.0)
-
-## 0.0.2
-
-### New Features
-
-- Add event system to the map.
-- Bump MapLibre Native on Android to version 11.5.0.
-- Bump other gradle dependencies.
-- Add and remove sources to the active map style programmatically.
-- Add and remove layers to the active map style programmatically.
-- Add `minZoom`, `maxZoom`, `minPitch`, `maxPitch` and `maxBounds` parameter.
-- Add duration parameters to `flyTo()`.
-- Add option to disable some or all input gestures.
-- `flyTo()` returns after the animation completes or throws an exception if it
-  has been cancelled.
-- Deprecate `tilt` parameters in favor of `pitch`.
-- Deprecate `onClick`, `onDoubleClick`, `onSecondaryClick` and `onLongClick` in
-  favor of the event system.
-
-### Bug fixes
-
-- Fix `jumpTo()` never returns on Android.
-
-Full
-Changelog: [v0.0.1+1...v0.0.2](https://github.com/josxha/flutter-maplibre/compare/v0.0.1+1...v0.0.2)
-
-## 0.0.1+1
-
-- Fix urls to website and embedded screenshots
-- Remove unused `plugin_platform_interface` dependency
-
-Full
-Changelog: [v0.0.1...v0.0.1+1](https://github.com/josxha/flutter-maplibre/compare/v0.0.1...v0.0.1+1)
-
-## 0.0.1
-
-- Initial release
-- Implement map for android and web
-- Add docs
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 120000
index 00000000..3f7bfd59
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+maplibre/CHANGELOG.md
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 9f24666f..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,184 +0,0 @@
-Copyright 2024 Joscha Eckert (josxha)
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (
-INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
-This project uses the MapLibre GL native libraries for Android and iOS from
-https://github.com/maplibre/maplibre-gl-native, which contain the following
-LICENSE:
---------------------------------------------------------------------------------
-
-BSD 2-Clause License
-
-Copyright (c) 2021 MapLibre contributors
-
-Copyright (c) 2018-2021 MapTiler.com
-
-Copyright (c) 2014-2020 Mapbox
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
-This project uses MapLibre GL JS library from
-https://github.com/maplibre/maplibre-gl-js, which contains the following
-LICENSE:
---------------------------------------------------------------------------------
-
-Copyright (c) 2023, MapLibre contributors
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of MapLibre GL JS nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
--------------------------------------------------------------------------------
-
-Contains code from mapbox-gl-js v1.13 and earlier
-
-Version v1.13 of mapbox-gl-js and earlier are licensed under a BSD-3-Clause license
-
-Copyright (c) 2020, Mapbox
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of Mapbox GL JS nor the names of its contributors
-  may be used to endorse or promote products derived from this software
-  without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
--------------------------------------------------------------------------------
-
-Contains code from glfx.js
-
-Copyright (C) 2011 by Evan Wallace
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
---------------------------------------------------------------------------------
-
-Contains a portion of d3-color https://github.com/d3/d3-color
-
-Copyright 2010-2016 Mike Bostock
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of contributors may be used to
-  endorse or promote products derived from this software without specific prior
-  written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 120000
index 00000000..6a345161
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1 @@
+maplibre/LICENSE
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index a897e4a2..00000000
--- a/README.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# MapLibre for Flutter
-
-[![Pub Version](https://img.shields.io/pub/v/maplibre)](https://pub.dev/packages/maplibre)
-[![stars](https://badgen.net/github/stars/josxha/flutter-maplibre?label=stars&color=green&icon=github)](https://github.com/josxha/flutter-maplibre/stargazers)
-[![likes](https://img.shields.io/pub/likes/maplibre?logo=flutter)](https://pub.dev/packages/maplibre)
-[![Pub Points](https://img.shields.io/pub/points/maplibre)](https://pub.dev/packages/maplibre/score)
-[![Pub Downloads](https://img.shields.io/pub/dm/maplibre)](https://pub.dev/packages/maplibre)
-
-[![codecov](https://codecov.io/gh/josxha/flutter-maplibre/graph/badge.svg?token=3LK7EQMSUM)](https://codecov.io/gh/josxha/flutter-maplibre)
-[![style: very good analysis](https://img.shields.io/badge/style-very_good_analysis-B22C89.svg)](https://pub.dev/packages/very_good_analysis)
-
-This package provides Flutter bindings for the MapLibre SDKs through native
-interoperability (FFI/JNI). Its goal is to deliver a consistent, cross-platform
-experience with excellent performance.
-
-- For web, it uses [maplibre-gl-js](https://github.com/maplibre/maplibre-gl-js),
-  a fork of [mapbox-gl-js](https://github.com/mapbox/mapbox-gl-js).
-- For Android and iOS, it
-  uses [maplibre-native](https://github.com/maplibre/maplibre-native) (formerly
-  maplibre-gl), a fork
-  of [mapbox-gl-native](https://github.com/mapbox/mapbox-gl-native).
-
-MapLibre is a permissive, open-source implementation of the Mapbox Vector Tile
-(MVT) standard. By leveraging native SDKs, this package enables high-performance
-rendering while supporting advanced mapping features.
-
-<table>
-  <tbody>
-    <tr>
-      <td style="text-align: center;">
-        <strong>Globe View</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/2244278ecb87117286a8c3fbad89717bc1231a1d/globe%20view.jpg" alt="Tilted and rotated map" />
-      </td>
-      <td style="text-align: center;">
-        <strong>Custom Styling</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/d8e2c7daf15221f716a2ebbd63e57a317cb089ab/docs/static/img/showcase-map.jpg" alt="Custom styled map" />
-      </td>
-      <td style="text-align: center;">
-        <strong>Pitch and Rotate</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/2244278ecb87117286a8c3fbad89717bc1231a1d/tilt%20map.jpg" alt="Tilted and rotated map" />
-      </td>
-    </tr>
-    <tr>
-      <td style="text-align: center;">
-        <strong>Raster Tiles</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/raster_layer.jpg" alt="Fill Layer" />
-      </td>
-      <td style="text-align: center;">
-        <strong>3D Building Outlines</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/fill_extrusion_layer.jpg" alt="Fill Extrusion Layer" />
-      </td>
-      <td style="text-align: center;">
-        <strong>Heatmaps</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/heatmap_layer.jpg" alt="Fill Layer" />
-      </td>
-    </tr>
-    <tr>
-      <td style="text-align: center;">
-        <strong>Polygons</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/fill_layer.jpg" alt="Fill Layer" />
-      </td>
-      <td style="text-align: center;">
-        <strong>Elevation</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/hillshade_layer.jpg" alt="Fill Extrusion Layer" />
-      </td>
-      <td style="text-align: center;">
-        <strong>Lines</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/line_layer.jpg" alt="Fill Layer" />
-      </td>
-    </tr>
-    <tr>
-      <td style="text-align: center;">
-        <strong>Circles</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/fe660b8d1c055d32e74cbc2ee0809281331a130b/docs/static/img/layers/circle_layer.jpg" alt="Circle Layer" />
-      </td>
-      <td style="text-align: center;">
-        <strong>Markers</strong>
-        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/symbol_layer.jpg" alt="Symbol Layer" />
-      </td>
-      <td style="text-align: center;">
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-## Resources
-
-### 📱Demo Application
-
-Many features of the package are showcased in the example app.
-
-- [Hosted Demo App](https://flutter-maplibre.pages.dev/demo)
-- [Code of the Example App](https://github.com/josxha/flutter-maplibre/tree/main/example/lib)
-
-### 🤓Get Started & Documentation
-
-Visit the docs to learn how to get started with maplibre in your
-project: [Get Started](https://flutter-maplibre.pages.dev/docs/category/getting-started)
-
-If you want to know more about the classes and properties of the package, have
-a look at
-the [API docs](https://pub.dev/documentation/maplibre/latest/maplibre/maplibre-library.html).
-
-## ❤️Development & Contributing
-
-All kinds of contributions are welcome. Thanks a lot if you consider to
-contribute in any way! There are different ways how you can help the
-development:
-
-- 🌟Give the project on [GitHub](https://github.com/josxha/flutter-maplibre) a star
-  and like it on [pub.dev](https://pub.dev/packages/maplibre).
-- 🪴Use the package in your project
-  and [share feedback](https://github.com/josxha/flutter-maplibre/discussions/categories/show-and-tell).
-- 🐛[Open bug reports](https://github.com/josxha/flutter-maplibre/issues/new?assignees=&labels=bug&projects=&template=1-bug.yml&title=%5BBUG%5D+%3Ctitle%3E)
-  in case you find any.
-- 💡If you need a specific
-  feature, [open a feature request](https://github.com/josxha/flutter-maplibre/issues/new?assignees=&labels=feature&projects=&template=2-feature.yml&title=%5BFEATURE%5D+%3Ctitle%3E).
-  or [post your idea as discussion](https://github.com/josxha/flutter-maplibre/discussions/categories/ideas).
-- 📖Enhance the package documentation.
-- 💝Sponsor this
-  project: [GitHub-Sponsors](https://github.com/sponsors/josxha), [PayPal](https://www.paypal.com/paypalme/joschaeckert).
-
-#### A huge thanks to all contributors! 😎
-
-[![List of contributors](https://contrib.rocks/image?repo=josxha/flutter-maplibre)](https://github.com/josxha/flutter-maplibre/graphs/contributors)
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 120000
index 00000000..fd826ab2
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+maplibre/README.md
\ No newline at end of file
diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
index d914bc04..e140a9eb 100644
--- a/example/analysis_options.yaml
+++ b/example/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: ../analysis_options.yaml
+include: ../maplibre/analysis_options.yaml
 
 formatter:
   page_width: 80
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index ca443477..18307ec0 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -16,8 +16,7 @@ dependencies:
     sdk: flutter
   go_router: ^16.0.0
   http: ^1.2.2
-  maplibre:
-    path: ../
+  maplibre: ^0.3.1
 
 dev_dependencies:
   flutter_launcher_icons: ^0.14.3
diff --git a/maplibre/.gitignore b/maplibre/.gitignore
new file mode 100644
index 00000000..280995b1
--- /dev/null
+++ b/maplibre/.gitignore
@@ -0,0 +1,43 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+pubspec.lock
+**/doc/api/
+.dart_tool/
+build/
+
+# converage
+**/coverage/
+
+# jnigen
+/mvn_jar/
+/mvn_java/
+
+# Swift Package Manager
+Package.resolved
+.swiftpm
+
+.vscode
+ios/maplibre/.build
diff --git a/.metadata b/maplibre/.metadata
similarity index 100%
rename from .metadata
rename to maplibre/.metadata
diff --git a/maplibre/.pubignore b/maplibre/.pubignore
new file mode 100644
index 00000000..3312dd06
--- /dev/null
+++ b/maplibre/.pubignore
@@ -0,0 +1 @@
+pigeons/
\ No newline at end of file
diff --git a/maplibre/CHANGELOG.md b/maplibre/CHANGELOG.md
new file mode 100644
index 00000000..a7113286
--- /dev/null
+++ b/maplibre/CHANGELOG.md
@@ -0,0 +1,317 @@
+## 0.3.1
+
+This release brings a couple of new features and bug fixes.
+The android platform view creation has been migrated to Dart. Android is now
+completely free from method channels.
+
+### New Features
+
+- Add `minZoom`, `maxZoom` to layers.
+- Bump MapLibre Native on Android to 12.0.+.
+- Migrate android platform view creation to Dart.
+- Throw exception if layer or source id already exists when adding
+  programmatically.
+- Add `aboveLayerId` and `atIndex` to `addLayer()`.
+- Add `addImages()` to `StyleController` to add multiple images at once.
+- Add `addImageFromAssets()` to load an image from Flutter assets.
+- Add `addImageFromIconData` to add an image from Flutter icons.
+
+### Bug Fixes
+
+- Fix `allowInteraction` parameter in `WidgetLayer` not working on web.
+- Fix pub.dev score.
+- Fix `maxBounds` parameter
+- Fix `linePattern` int array causing crash on iOS.
+
+Full
+Changelog: [v0.3.0...v0.3.1](https://github.com/josxha/flutter-maplibre/compare/v0.3.0...v0.3.1)
+
+## 0.3.0
+
+In this release, I'm blazed to finally announce support for iOS.
+Similar to our other platforms, iOS uses FFI to natively interop between Dart
+and Swift/ObjC. Checkout
+the [iOS documentation](https://flutter-maplibre.pages.dev/docs/getting-started/setup-ios)
+to get started.
+A big thanks to @mhernz, @gabbopalma and @jt274 that helped with their awesome
+contributions in this release!
+
+This release introduces breaking changes. Head over to
+the [migration guide](https://flutter-maplibre.pages.dev/docs/upgrade) to learn
+more on how to update your implementation.
+
+### New Features
+
+- **Breaking** Require Flutter 3.35
+- **Breaking** Migrate from `geotypes`
+  to [geobase](https://pub.dev/packages/geobase).
+- **Breaking** Return logical pixels in events on all platforms.
+- **Breaking** Add `screenPoint` parameter to `MapEventUserInput` events to show
+  the screen coordinates in logical pixels where the user interacted with the
+  map.
+- **Breaking** Rename `rotationDuration` in `MapCompass` to
+  `nativeRotationDuration`.
+- **Breaking** Multiple `MapController` functions are now called synchronously,
+  their `*Sync()` overloads have been removed.
+- **Breaking** All declarative layers now require a `FeatureCollection`. This
+  allows users to add properties to their layers.
+- Add iOS as supported platform with MapLibre Native iOS 6.19.
+- Update MapLibre Native Android to 11.13
+- Load map styles from Flutter assets, a JSON string or via URI.
+- Add `setStyle()`, to know when the map style has loaded, listen to
+  `onStyleLoaded()`.
+- Add support for PMTiles on the web.
+- Add `androidTranslucentTextureSurface` and `androidForegroundLoadColor` to use
+  a translucent map.
+- Add `MapScalebar.units` to support imperial units in the scalebar.
+- Add `featuresAtPoint()` and `featuresInRect()` to `MapController`.
+- Update to `pigeon` 26.0.0
+
+### Bug Fixes
+
+- Fix missing export of `BearingRenderMode`
+- Remove `dart:io` import to fix pub.dev WASM compatibility detection
+
+Full
+Changelog: [v0.2.2...v0.3.0](https://github.com/josxha/flutter-maplibre/compare/v0.2.2...v0.3.0)
+
+## 0.2.2
+
+Maintenance release and some new functionality.
+Thanks for your contribution in this release @jt274!
+
+### New Features
+
+- Migrate `requestLocationPermissions()` and `addLayer()` to use JNI
+- Update `jni` and `jnigen` to v0.14
+- Update `pigeon` to v25
+- Migrate gradle DSL to Kotlin
+- Add `LngLatBounds.fromPoints()` constructor.
+
+...and numerous other dependencies updated in this release.
+
+Full
+Changelog: [v0.2.1...v0.2.2](https://github.com/josxha/flutter-maplibre/compare/v0.2.1...v0.2.2)
+
+## 0.2.1
+
+This release builds upon the long anticipated merged threads in Flutter 3.29.0
+which removes the need of switching threads. Furthermore, the release contains a
+couple of features and new fixes.
+
+Thanks for your contributions for this release, @felix-larsen and @pamtbaau!
+
+### New Features
+
+- Upgrade MapLibre Native on Android
+  to [11.8.0](https://github.com/maplibre/maplibre-native/blob/main/platform/android/CHANGELOG.md#1180)
+  which introduces support for PMTiles.
+- Add `removePinchOnPressed` and `webRotationSpeed` as parameters to the
+  `MapCompass` widget.
+- Allow the `SourceAttribution` widget to use multiple lines for its
+  attributions.
+- Underline an attribution link for a `SourceAttribution` widget when hovered
+  with a cursor.
+- Add the parameter `allowInteraction` to the `WidgetLayer` that allows widgets
+  to detect gestures on these widgets.
+- Reintroduce awaitable `moveCamera()`, `animateCamera()` and `fitCamera()` on
+  Android.
+- Use synchronous JNI calls on Android to prevent thread hopping.
+
+### Bug Fixes
+
+- Fix exceptions when the map widget rebuilds a lot in a short amount of time.
+- Fix `moveCamera()`, `animateCamera()` and `fitCamera()` does not ignore null
+  parameters.
+- Fix app freeze on Android using Flutter 3.29.0 caused by the merged threads.
+- Fix exception when adding a RasterSource programatically.
+
+### Misc
+
+- Update examples and documentation.
+- Set minimum Flutter version
+  to [3.29.0](https://discord.com/channels/951867686378409984/951879268227485707/1339719764574081148)
+  and minimum Dart version
+  to [3.7.0](https://discord.com/channels/951867686378409984/951879268227485707/1339719747981545485).
+- Use the new code formatting.
+- Upgrade pigeon to 24.
+
+Full
+Changelog: [v0.2.0...v0.2.1](https://github.com/josxha/flutter-maplibre/compare/v0.2.0...v0.2.1)
+
+## 0.2.0
+
+This release is a collection of user affecting changes along a couple of new
+features and bug fixes.
+Head over to
+the [migration guide](https://flutter-maplibre.pages.dev/docs/upgrade) to learn
+more on how to update your implementation.
+
+A big thanks to @gabbopalma for his contributions in this release.
+
+### Breaking Changes
+
+- Rename the `Layer` postfix of the more low level style classes
+  to `StyleLayer`.
+- Remove web-only map controls (ScaleControl, GeolocateControl,
+  AttributionControl, FullscreenControl, LogoControl, NavigationControl,
+  TerrainControl).
+- Remove MapLibre Native specific User Interface options (logo, attribution,
+  compass).
+- Rename `ZoomButtons` to `ControlButtons`.
+- Move style related controller calls to the `StyleController` that can be
+  accessed via a nullable `mapController.style` field.
+- Return the `StyleController` in the `onStyleLoaded()` callback and in
+  the `MapEventStyleLoaded` event.
+- An `ImageSource` now requires a static typed `LngLatQuad` object.
+- Set the minimum required Flutter version to 3.27.
+
+### New Features
+
+- Bump MapLibre Native on Android to 11.7.+.
+- Bump MapLibre GL JS on Web to version 5.
+- Add `style.setProjection()` to switch to globe projection programmatically.
+- Add a user location button to the `ControlButtons`.
+- Bump ktlint to 0.4.19 and gradle to 8.6.1.
+- Bump jni and jnigen to 0.13.0 and migrate bindings.
+- Widen the gradle dependency constraints to allow patch updates.
+- Add logo as pub.dev screenshot.
+- Structure the API docs in topics.
+- Add an internal `WidgetStateNative` for better code reuse in the upcoming iOS
+  release.
+
+## Bug Fixes
+
+- Fix can't rotate with two fingers on web.
+- Fix text overflow in the scale bar widget.
+- Fix deprecations introduced in Flutter 3.27.
+
+## Misc
+
+- Enhance documentation.
+- Build example app with java 21
+
+Full
+Changelog: [v0.1.2...v0.2.0](https://github.com/josxha/flutter-maplibre/compare/v0.1.2...v0.2.0)
+
+## 0.1.2
+
+This release adds the last missing features for Android and Web, that are were
+planned for now. The package will continue its ongoing efforts for stability
+before iOS gets added as a supported platform.
+
+### New Features
+
+- Add `OfflineManager` for offline maps, cache management and bulk downloading.
+- Add `PermissionsManager` to check and request location permissions.
+- Add `WidgetLayer` to support widgets as Markers on the map.
+- Add alternative Flutter platform view options for Texture Layer Hybrid
+  Composition, Hybrid Composition, Virtual Display.
+- Bump MapLibre Native on Android to version `11.6.+`.
+- Add web-only controller functions `toScreenLocationSync()`,
+  `toLngLatSync()`, `toScreenLocationsSync()`, `toLngLatsSync()`,
+  `getMetersPerPixelAtLatitudeSync()` and `getVisibleRegionSync()`.
+- Add `MapOptions.of(context)` and `MapOptions.maybeOf(context)`.
+- Add `padding` and `alignment` parameters to the `MapScalebar` widget.
+
+### Bug Fixes
+
+- Fix WebAssembly builds.
+- Remove unused `flutter_markdown` package.
+
+### Misc
+
+- Add unit tests, add Android integration tests.
+- Use [codecov](https://app.codecov.io/gh/josxha/flutter-maplibre) to monitor
+  test coverage.
+- Improve file structure by using a `/platform` directory.
+
+Full
+Changelog: [v0.1.1...v0.1.2](https://github.com/josxha/flutter-maplibre/compare/v0.1.1...v0.1.2)
+
+## 0.1.1
+
+### New Features
+
+- Add `controller.queryLayers()` to check what layers have been clicked.
+- Add scalebar, zoom buttons, compass and attribution widgets as a unified user
+  interface.
+- Improve hash distribution
+- Add `MapOptions` parameters to toggle platform specific UIs.
+
+### Bug Fixes
+
+- Fix `controller.getVisibleRegion()` throws exception on Android.
+
+Full
+Changelog: [v0.1.0...v0.1.1](https://github.com/josxha/flutter-maplibre/compare/v0.1.0...v0.1.1)
+
+## 0.1.0
+
+### Breaking Changes
+
+- Use a "Web" prefix for all web-only controls, for
+  example `WebGeolocateControl`.
+- Rename web-only `MapOptions.controls` to `MapOptions.webControls`.
+- Rename `jumpTo()` to `moveCamera()` and `flyTo()` to `animateCamera()`.
+- Add `init` prefix to not modifiable `MapOptions` parameters.
+- Remove click callbacks in favor of the event system.
+- Bump minimum Flutter version
+  to [3.24.0](https://medium.com/flutter/whats-new-in-flutter-3-24-6c040f87d1e4)
+  (Minimum Dart version
+  of [3.5.0](https://medium.com/dartlang/dart-3-5-6ca36259fa2f)).
+- Can't await the end of `animateCamera()` in this version.
+
+Read the [Upgrade Guide](https://flutter-maplibre.pages.dev/docs/upgrade) for
+instructions on how to upgrade.
+
+### New Features
+
+- Bump MapLibre Android SDK
+  to [11.5.1](https://github.com/maplibre/maplibre-native/releases/tag/android-v11.5.1).
+- Add high level `AnnotationLayer`s as easy to use annotations.
+- Use [jnigen](https://pub.dev/packages/jnigen) for direct interop with Java.
+- Add user location to the map.
+- Check Style for Kotlin
+
+Full
+Changelog: [v0.0.2...v0.1.0](https://github.com/josxha/flutter-maplibre/compare/v0.0.2...v0.1.0)
+
+## 0.0.2
+
+### New Features
+
+- Add event system to the map.
+- Bump MapLibre Native on Android to version 11.5.0.
+- Bump other gradle dependencies.
+- Add and remove sources to the active map style programmatically.
+- Add and remove layers to the active map style programmatically.
+- Add `minZoom`, `maxZoom`, `minPitch`, `maxPitch` and `maxBounds` parameter.
+- Add duration parameters to `flyTo()`.
+- Add option to disable some or all input gestures.
+- `flyTo()` returns after the animation completes or throws an exception if it
+  has been cancelled.
+- Deprecate `tilt` parameters in favor of `pitch`.
+- Deprecate `onClick`, `onDoubleClick`, `onSecondaryClick` and `onLongClick` in
+  favor of the event system.
+
+### Bug fixes
+
+- Fix `jumpTo()` never returns on Android.
+
+Full
+Changelog: [v0.0.1+1...v0.0.2](https://github.com/josxha/flutter-maplibre/compare/v0.0.1+1...v0.0.2)
+
+## 0.0.1+1
+
+- Fix urls to website and embedded screenshots
+- Remove unused `plugin_platform_interface` dependency
+
+Full
+Changelog: [v0.0.1...v0.0.1+1](https://github.com/josxha/flutter-maplibre/compare/v0.0.1...v0.0.1+1)
+
+## 0.0.1
+
+- Initial release
+- Implement map for android and web
+- Add docs
diff --git a/maplibre/LICENSE b/maplibre/LICENSE
new file mode 100644
index 00000000..9f24666f
--- /dev/null
+++ b/maplibre/LICENSE
@@ -0,0 +1,184 @@
+Copyright 2024 Joscha Eckert (josxha)
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (
+INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+This project uses the MapLibre GL native libraries for Android and iOS from
+https://github.com/maplibre/maplibre-gl-native, which contain the following
+LICENSE:
+--------------------------------------------------------------------------------
+
+BSD 2-Clause License
+
+Copyright (c) 2021 MapLibre contributors
+
+Copyright (c) 2018-2021 MapTiler.com
+
+Copyright (c) 2014-2020 Mapbox
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+This project uses MapLibre GL JS library from
+https://github.com/maplibre/maplibre-gl-js, which contains the following
+LICENSE:
+--------------------------------------------------------------------------------
+
+Copyright (c) 2023, MapLibre contributors
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of MapLibre GL JS nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-------------------------------------------------------------------------------
+
+Contains code from mapbox-gl-js v1.13 and earlier
+
+Version v1.13 of mapbox-gl-js and earlier are licensed under a BSD-3-Clause license
+
+Copyright (c) 2020, Mapbox
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of Mapbox GL JS nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-------------------------------------------------------------------------------
+
+Contains code from glfx.js
+
+Copyright (C) 2011 by Evan Wallace
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+Contains a portion of d3-color https://github.com/d3/d3-color
+
+Copyright 2010-2016 Mike Bostock
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the author nor the names of contributors may be used to
+  endorse or promote products derived from this software without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/maplibre/README.md b/maplibre/README.md
new file mode 100644
index 00000000..a897e4a2
--- /dev/null
+++ b/maplibre/README.md
@@ -0,0 +1,125 @@
+# MapLibre for Flutter
+
+[![Pub Version](https://img.shields.io/pub/v/maplibre)](https://pub.dev/packages/maplibre)
+[![stars](https://badgen.net/github/stars/josxha/flutter-maplibre?label=stars&color=green&icon=github)](https://github.com/josxha/flutter-maplibre/stargazers)
+[![likes](https://img.shields.io/pub/likes/maplibre?logo=flutter)](https://pub.dev/packages/maplibre)
+[![Pub Points](https://img.shields.io/pub/points/maplibre)](https://pub.dev/packages/maplibre/score)
+[![Pub Downloads](https://img.shields.io/pub/dm/maplibre)](https://pub.dev/packages/maplibre)
+
+[![codecov](https://codecov.io/gh/josxha/flutter-maplibre/graph/badge.svg?token=3LK7EQMSUM)](https://codecov.io/gh/josxha/flutter-maplibre)
+[![style: very good analysis](https://img.shields.io/badge/style-very_good_analysis-B22C89.svg)](https://pub.dev/packages/very_good_analysis)
+
+This package provides Flutter bindings for the MapLibre SDKs through native
+interoperability (FFI/JNI). Its goal is to deliver a consistent, cross-platform
+experience with excellent performance.
+
+- For web, it uses [maplibre-gl-js](https://github.com/maplibre/maplibre-gl-js),
+  a fork of [mapbox-gl-js](https://github.com/mapbox/mapbox-gl-js).
+- For Android and iOS, it
+  uses [maplibre-native](https://github.com/maplibre/maplibre-native) (formerly
+  maplibre-gl), a fork
+  of [mapbox-gl-native](https://github.com/mapbox/mapbox-gl-native).
+
+MapLibre is a permissive, open-source implementation of the Mapbox Vector Tile
+(MVT) standard. By leveraging native SDKs, this package enables high-performance
+rendering while supporting advanced mapping features.
+
+<table>
+  <tbody>
+    <tr>
+      <td style="text-align: center;">
+        <strong>Globe View</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/2244278ecb87117286a8c3fbad89717bc1231a1d/globe%20view.jpg" alt="Tilted and rotated map" />
+      </td>
+      <td style="text-align: center;">
+        <strong>Custom Styling</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/d8e2c7daf15221f716a2ebbd63e57a317cb089ab/docs/static/img/showcase-map.jpg" alt="Custom styled map" />
+      </td>
+      <td style="text-align: center;">
+        <strong>Pitch and Rotate</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/2244278ecb87117286a8c3fbad89717bc1231a1d/tilt%20map.jpg" alt="Tilted and rotated map" />
+      </td>
+    </tr>
+    <tr>
+      <td style="text-align: center;">
+        <strong>Raster Tiles</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/raster_layer.jpg" alt="Fill Layer" />
+      </td>
+      <td style="text-align: center;">
+        <strong>3D Building Outlines</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/fill_extrusion_layer.jpg" alt="Fill Extrusion Layer" />
+      </td>
+      <td style="text-align: center;">
+        <strong>Heatmaps</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/heatmap_layer.jpg" alt="Fill Layer" />
+      </td>
+    </tr>
+    <tr>
+      <td style="text-align: center;">
+        <strong>Polygons</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/fill_layer.jpg" alt="Fill Layer" />
+      </td>
+      <td style="text-align: center;">
+        <strong>Elevation</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/hillshade_layer.jpg" alt="Fill Extrusion Layer" />
+      </td>
+      <td style="text-align: center;">
+        <strong>Lines</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/line_layer.jpg" alt="Fill Layer" />
+      </td>
+    </tr>
+    <tr>
+      <td style="text-align: center;">
+        <strong>Circles</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/fe660b8d1c055d32e74cbc2ee0809281331a130b/docs/static/img/layers/circle_layer.jpg" alt="Circle Layer" />
+      </td>
+      <td style="text-align: center;">
+        <strong>Markers</strong>
+        <img src="https://raw.githubusercontent.com/josxha/flutter-maplibre/427311f8f4577c215bf73caf46e3769629e74e3b/docs/static/img/layers/symbol_layer.jpg" alt="Symbol Layer" />
+      </td>
+      <td style="text-align: center;">
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+## Resources
+
+### 📱Demo Application
+
+Many features of the package are showcased in the example app.
+
+- [Hosted Demo App](https://flutter-maplibre.pages.dev/demo)
+- [Code of the Example App](https://github.com/josxha/flutter-maplibre/tree/main/example/lib)
+
+### 🤓Get Started & Documentation
+
+Visit the docs to learn how to get started with maplibre in your
+project: [Get Started](https://flutter-maplibre.pages.dev/docs/category/getting-started)
+
+If you want to know more about the classes and properties of the package, have
+a look at
+the [API docs](https://pub.dev/documentation/maplibre/latest/maplibre/maplibre-library.html).
+
+## ❤️Development & Contributing
+
+All kinds of contributions are welcome. Thanks a lot if you consider to
+contribute in any way! There are different ways how you can help the
+development:
+
+- 🌟Give the project on [GitHub](https://github.com/josxha/flutter-maplibre) a star
+  and like it on [pub.dev](https://pub.dev/packages/maplibre).
+- 🪴Use the package in your project
+  and [share feedback](https://github.com/josxha/flutter-maplibre/discussions/categories/show-and-tell).
+- 🐛[Open bug reports](https://github.com/josxha/flutter-maplibre/issues/new?assignees=&labels=bug&projects=&template=1-bug.yml&title=%5BBUG%5D+%3Ctitle%3E)
+  in case you find any.
+- 💡If you need a specific
+  feature, [open a feature request](https://github.com/josxha/flutter-maplibre/issues/new?assignees=&labels=feature&projects=&template=2-feature.yml&title=%5BFEATURE%5D+%3Ctitle%3E).
+  or [post your idea as discussion](https://github.com/josxha/flutter-maplibre/discussions/categories/ideas).
+- 📖Enhance the package documentation.
+- 💝Sponsor this
+  project: [GitHub-Sponsors](https://github.com/sponsors/josxha), [PayPal](https://www.paypal.com/paypalme/joschaeckert).
+
+#### A huge thanks to all contributors! 😎
+
+[![List of contributors](https://contrib.rocks/image?repo=josxha/flutter-maplibre)](https://github.com/josxha/flutter-maplibre/graphs/contributors)
\ No newline at end of file
diff --git a/analysis_options.yaml b/maplibre/analysis_options.yaml
similarity index 100%
rename from analysis_options.yaml
rename to maplibre/analysis_options.yaml
diff --git a/android/.gitignore b/maplibre/android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to maplibre/android/.gitignore
diff --git a/android/build.gradle b/maplibre/android/build.gradle
similarity index 100%
rename from android/build.gradle
rename to maplibre/android/build.gradle
diff --git a/android/consumer-rules.pro b/maplibre/android/consumer-rules.pro
similarity index 100%
rename from android/consumer-rules.pro
rename to maplibre/android/consumer-rules.pro
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/maplibre/android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.jar
rename to maplibre/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/maplibre/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.properties
rename to maplibre/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/gradlew b/maplibre/android/gradlew
old mode 100755
new mode 100644
similarity index 100%
rename from android/gradlew
rename to maplibre/android/gradlew
diff --git a/android/gradlew.bat b/maplibre/android/gradlew.bat
similarity index 100%
rename from android/gradlew.bat
rename to maplibre/android/gradlew.bat
diff --git a/android/settings.gradle b/maplibre/android/settings.gradle
similarity index 100%
rename from android/settings.gradle
rename to maplibre/android/settings.gradle
diff --git a/android/src/main/AndroidManifest.xml b/maplibre/android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/src/main/AndroidManifest.xml
rename to maplibre/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/kotlin/com/github/josxha/maplibre/FlutterApi.kt b/maplibre/android/src/main/kotlin/com/github/josxha/maplibre/FlutterApi.kt
similarity index 100%
rename from android/src/main/kotlin/com/github/josxha/maplibre/FlutterApi.kt
rename to maplibre/android/src/main/kotlin/com/github/josxha/maplibre/FlutterApi.kt
diff --git a/android/src/main/kotlin/com/github/josxha/maplibre/MapLibrePlugin.kt b/maplibre/android/src/main/kotlin/com/github/josxha/maplibre/MapLibrePlugin.kt
similarity index 100%
rename from android/src/main/kotlin/com/github/josxha/maplibre/MapLibrePlugin.kt
rename to maplibre/android/src/main/kotlin/com/github/josxha/maplibre/MapLibrePlugin.kt
diff --git a/android/src/main/kotlin/com/github/josxha/maplibre/MapLibreRegistry.kt b/maplibre/android/src/main/kotlin/com/github/josxha/maplibre/MapLibreRegistry.kt
similarity index 100%
rename from android/src/main/kotlin/com/github/josxha/maplibre/MapLibreRegistry.kt
rename to maplibre/android/src/main/kotlin/com/github/josxha/maplibre/MapLibreRegistry.kt
diff --git a/android/src/test/kotlin/com/github/josxha/maplibre/MapLibreMapControllerTest.kt b/maplibre/android/src/test/kotlin/com/github/josxha/maplibre/MapLibreMapControllerTest.kt
similarity index 100%
rename from android/src/test/kotlin/com/github/josxha/maplibre/MapLibreMapControllerTest.kt
rename to maplibre/android/src/test/kotlin/com/github/josxha/maplibre/MapLibreMapControllerTest.kt
diff --git a/android/src/test/kotlin/com/github/josxha/maplibre/MapLibrePluginTest.kt b/maplibre/android/src/test/kotlin/com/github/josxha/maplibre/MapLibrePluginTest.kt
similarity index 100%
rename from android/src/test/kotlin/com/github/josxha/maplibre/MapLibrePluginTest.kt
rename to maplibre/android/src/test/kotlin/com/github/josxha/maplibre/MapLibrePluginTest.kt
diff --git a/dartdoc_options.yaml b/maplibre/dartdoc_options.yaml
similarity index 100%
rename from dartdoc_options.yaml
rename to maplibre/dartdoc_options.yaml
diff --git a/doc/basic.md b/maplibre/doc/basic.md
similarity index 100%
rename from doc/basic.md
rename to maplibre/doc/basic.md
diff --git a/doc/events.md b/maplibre/doc/events.md
similarity index 100%
rename from doc/events.md
rename to maplibre/doc/events.md
diff --git a/doc/favicon-32x32.png b/maplibre/doc/favicon-32x32.png
similarity index 100%
rename from doc/favicon-32x32.png
rename to maplibre/doc/favicon-32x32.png
diff --git a/doc/layers.md b/maplibre/doc/layers.md
similarity index 100%
rename from doc/layers.md
rename to maplibre/doc/layers.md
diff --git a/doc/logo.png b/maplibre/doc/logo.png
similarity index 100%
rename from doc/logo.png
rename to maplibre/doc/logo.png
diff --git a/doc/logo_rounded.png b/maplibre/doc/logo_rounded.png
similarity index 100%
rename from doc/logo_rounded.png
rename to maplibre/doc/logo_rounded.png
diff --git a/doc/offline.md b/maplibre/doc/offline.md
similarity index 100%
rename from doc/offline.md
rename to maplibre/doc/offline.md
diff --git a/doc/style.md b/maplibre/doc/style.md
similarity index 100%
rename from doc/style.md
rename to maplibre/doc/style.md
diff --git a/doc/ui.md b/maplibre/doc/ui.md
similarity index 100%
rename from doc/ui.md
rename to maplibre/doc/ui.md
diff --git a/maplibre/example/example.md b/maplibre/example/example.md
new file mode 100644
index 00000000..88380e78
--- /dev/null
+++ b/maplibre/example/example.md
@@ -0,0 +1,2 @@
+- Checkout our docs for a minimal example: [Getting Started - Use Widget](https://flutter-maplibre.pages.dev/docs/getting-started/use-widget)
+- Check the example app for implementations of different use cases: [Example App](../example/)
diff --git a/ios/Resources/PrivacyInfo.xcprivacy b/maplibre/ios/Resources/PrivacyInfo.xcprivacy
similarity index 100%
rename from ios/Resources/PrivacyInfo.xcprivacy
rename to maplibre/ios/Resources/PrivacyInfo.xcprivacy
diff --git a/ios/maplibre/Package.swift b/maplibre/ios/maplibre/Package.swift
similarity index 100%
rename from ios/maplibre/Package.swift
rename to maplibre/ios/maplibre/Package.swift
diff --git a/ios/maplibre/Sources/maplibre/MaplibrePlugin.swift b/maplibre/ios/maplibre/Sources/maplibre/MaplibrePlugin.swift
similarity index 100%
rename from ios/maplibre/Sources/maplibre/MaplibrePlugin.swift
rename to maplibre/ios/maplibre/Sources/maplibre/MaplibrePlugin.swift
diff --git a/ios/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy b/maplibre/ios/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy
similarity index 100%
rename from ios/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy
rename to maplibre/ios/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy
diff --git a/jnigen.yaml b/maplibre/jnigen.yaml
similarity index 100%
rename from jnigen.yaml
rename to maplibre/jnigen.yaml
diff --git a/lib/maplibre.dart b/maplibre/lib/maplibre.dart
similarity index 100%
rename from lib/maplibre.dart
rename to maplibre/lib/maplibre.dart
diff --git a/lib/src/android_platform_view_mode.dart b/maplibre/lib/src/android_platform_view_mode.dart
similarity index 100%
rename from lib/src/android_platform_view_mode.dart
rename to maplibre/lib/src/android_platform_view_mode.dart
diff --git a/lib/src/inherited_model.dart b/maplibre/lib/src/inherited_model.dart
similarity index 100%
rename from lib/src/inherited_model.dart
rename to maplibre/lib/src/inherited_model.dart
diff --git a/lib/src/layer/circle_layer.dart b/maplibre/lib/src/layer/circle_layer.dart
similarity index 100%
rename from lib/src/layer/circle_layer.dart
rename to maplibre/lib/src/layer/circle_layer.dart
diff --git a/lib/src/layer/extensions.dart b/maplibre/lib/src/layer/extensions.dart
similarity index 100%
rename from lib/src/layer/extensions.dart
rename to maplibre/lib/src/layer/extensions.dart
diff --git a/lib/src/layer/layer.dart b/maplibre/lib/src/layer/layer.dart
similarity index 100%
rename from lib/src/layer/layer.dart
rename to maplibre/lib/src/layer/layer.dart
diff --git a/lib/src/layer/layer_manager.dart b/maplibre/lib/src/layer/layer_manager.dart
similarity index 100%
rename from lib/src/layer/layer_manager.dart
rename to maplibre/lib/src/layer/layer_manager.dart
diff --git a/lib/src/layer/marker_layer.dart b/maplibre/lib/src/layer/marker_layer.dart
similarity index 100%
rename from lib/src/layer/marker_layer.dart
rename to maplibre/lib/src/layer/marker_layer.dart
diff --git a/lib/src/layer/polygon_layer.dart b/maplibre/lib/src/layer/polygon_layer.dart
similarity index 100%
rename from lib/src/layer/polygon_layer.dart
rename to maplibre/lib/src/layer/polygon_layer.dart
diff --git a/lib/src/layer/polyline_layer.dart b/maplibre/lib/src/layer/polyline_layer.dart
similarity index 100%
rename from lib/src/layer/polyline_layer.dart
rename to maplibre/lib/src/layer/polyline_layer.dart
diff --git a/lib/src/lng_lat_bounds.dart b/maplibre/lib/src/lng_lat_bounds.dart
similarity index 100%
rename from lib/src/lng_lat_bounds.dart
rename to maplibre/lib/src/lng_lat_bounds.dart
diff --git a/lib/src/map.dart b/maplibre/lib/src/map.dart
similarity index 100%
rename from lib/src/map.dart
rename to maplibre/lib/src/map.dart
diff --git a/lib/src/map_camera.dart b/maplibre/lib/src/map_camera.dart
similarity index 100%
rename from lib/src/map_camera.dart
rename to maplibre/lib/src/map_camera.dart
diff --git a/lib/src/map_controller.dart b/maplibre/lib/src/map_controller.dart
similarity index 100%
rename from lib/src/map_controller.dart
rename to maplibre/lib/src/map_controller.dart
diff --git a/lib/src/map_events.dart b/maplibre/lib/src/map_events.dart
similarity index 100%
rename from lib/src/map_events.dart
rename to maplibre/lib/src/map_events.dart
diff --git a/lib/src/map_gestures.dart b/maplibre/lib/src/map_gestures.dart
similarity index 100%
rename from lib/src/map_gestures.dart
rename to maplibre/lib/src/map_gestures.dart
diff --git a/lib/src/map_options.dart b/maplibre/lib/src/map_options.dart
similarity index 100%
rename from lib/src/map_options.dart
rename to maplibre/lib/src/map_options.dart
diff --git a/lib/src/map_state.dart b/maplibre/lib/src/map_state.dart
similarity index 100%
rename from lib/src/map_state.dart
rename to maplibre/lib/src/map_state.dart
diff --git a/lib/src/offline/download_progress.dart b/maplibre/lib/src/offline/download_progress.dart
similarity index 100%
rename from lib/src/offline/download_progress.dart
rename to maplibre/lib/src/offline/download_progress.dart
diff --git a/lib/src/offline/offline_manager.dart b/maplibre/lib/src/offline/offline_manager.dart
similarity index 100%
rename from lib/src/offline/offline_manager.dart
rename to maplibre/lib/src/offline/offline_manager.dart
diff --git a/lib/src/offline/offline_region.dart b/maplibre/lib/src/offline/offline_region.dart
similarity index 100%
rename from lib/src/offline/offline_region.dart
rename to maplibre/lib/src/offline/offline_region.dart
diff --git a/lib/src/permission_manager.dart b/maplibre/lib/src/permission_manager.dart
similarity index 100%
rename from lib/src/permission_manager.dart
rename to maplibre/lib/src/permission_manager.dart
diff --git a/lib/src/platform/android/extensions.dart b/maplibre/lib/src/platform/android/extensions.dart
similarity index 100%
rename from lib/src/platform/android/extensions.dart
rename to maplibre/lib/src/platform/android/extensions.dart
diff --git a/lib/src/platform/android/flutter_api.dart b/maplibre/lib/src/platform/android/flutter_api.dart
similarity index 100%
rename from lib/src/platform/android/flutter_api.dart
rename to maplibre/lib/src/platform/android/flutter_api.dart
diff --git a/lib/src/platform/android/functions.dart b/maplibre/lib/src/platform/android/functions.dart
similarity index 100%
rename from lib/src/platform/android/functions.dart
rename to maplibre/lib/src/platform/android/functions.dart
diff --git a/lib/src/platform/android/jni.dart b/maplibre/lib/src/platform/android/jni.dart
similarity index 100%
rename from lib/src/platform/android/jni.dart
rename to maplibre/lib/src/platform/android/jni.dart
diff --git a/lib/src/platform/android/jni/android/app/Activity.dart b/maplibre/lib/src/platform/android/jni/android/app/Activity.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/app/Activity.dart
rename to maplibre/lib/src/platform/android/jni/android/app/Activity.dart
diff --git a/lib/src/platform/android/jni/android/app/_package.dart b/maplibre/lib/src/platform/android/jni/android/app/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/app/_package.dart
rename to maplibre/lib/src/platform/android/jni/android/app/_package.dart
diff --git a/lib/src/platform/android/jni/android/content/Context.dart b/maplibre/lib/src/platform/android/jni/android/content/Context.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/content/Context.dart
rename to maplibre/lib/src/platform/android/jni/android/content/Context.dart
diff --git a/lib/src/platform/android/jni/android/content/_package.dart b/maplibre/lib/src/platform/android/jni/android/content/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/content/_package.dart
rename to maplibre/lib/src/platform/android/jni/android/content/_package.dart
diff --git a/lib/src/platform/android/jni/android/graphics/BitmapFactory.dart b/maplibre/lib/src/platform/android/jni/android/graphics/BitmapFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/graphics/BitmapFactory.dart
rename to maplibre/lib/src/platform/android/jni/android/graphics/BitmapFactory.dart
diff --git a/lib/src/platform/android/jni/android/graphics/PointF.dart b/maplibre/lib/src/platform/android/jni/android/graphics/PointF.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/graphics/PointF.dart
rename to maplibre/lib/src/platform/android/jni/android/graphics/PointF.dart
diff --git a/lib/src/platform/android/jni/android/graphics/RectF.dart b/maplibre/lib/src/platform/android/jni/android/graphics/RectF.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/graphics/RectF.dart
rename to maplibre/lib/src/platform/android/jni/android/graphics/RectF.dart
diff --git a/lib/src/platform/android/jni/android/graphics/_package.dart b/maplibre/lib/src/platform/android/jni/android/graphics/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/graphics/_package.dart
rename to maplibre/lib/src/platform/android/jni/android/graphics/_package.dart
diff --git a/lib/src/platform/android/jni/android/location/Location.dart b/maplibre/lib/src/platform/android/jni/android/location/Location.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/location/Location.dart
rename to maplibre/lib/src/platform/android/jni/android/location/Location.dart
diff --git a/lib/src/platform/android/jni/android/location/_package.dart b/maplibre/lib/src/platform/android/jni/android/location/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/location/_package.dart
rename to maplibre/lib/src/platform/android/jni/android/location/_package.dart
diff --git a/lib/src/platform/android/jni/android/view/ViewGroup.dart b/maplibre/lib/src/platform/android/jni/android/view/ViewGroup.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/view/ViewGroup.dart
rename to maplibre/lib/src/platform/android/jni/android/view/ViewGroup.dart
diff --git a/lib/src/platform/android/jni/android/view/_package.dart b/maplibre/lib/src/platform/android/jni/android/view/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/view/_package.dart
rename to maplibre/lib/src/platform/android/jni/android/view/_package.dart
diff --git a/lib/src/platform/android/jni/android/widget/FrameLayout.dart b/maplibre/lib/src/platform/android/jni/android/widget/FrameLayout.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/widget/FrameLayout.dart
rename to maplibre/lib/src/platform/android/jni/android/widget/FrameLayout.dart
diff --git a/lib/src/platform/android/jni/android/widget/_package.dart b/maplibre/lib/src/platform/android/jni/android/widget/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/android/widget/_package.dart
rename to maplibre/lib/src/platform/android/jni/android/widget/_package.dart
diff --git a/lib/src/platform/android/jni/com/github/josxha/maplibre/FlutterApi.dart b/maplibre/lib/src/platform/android/jni/com/github/josxha/maplibre/FlutterApi.dart
similarity index 100%
rename from lib/src/platform/android/jni/com/github/josxha/maplibre/FlutterApi.dart
rename to maplibre/lib/src/platform/android/jni/com/github/josxha/maplibre/FlutterApi.dart
diff --git a/lib/src/platform/android/jni/com/github/josxha/maplibre/MapLibreRegistry.dart b/maplibre/lib/src/platform/android/jni/com/github/josxha/maplibre/MapLibreRegistry.dart
similarity index 100%
rename from lib/src/platform/android/jni/com/github/josxha/maplibre/MapLibreRegistry.dart
rename to maplibre/lib/src/platform/android/jni/com/github/josxha/maplibre/MapLibreRegistry.dart
diff --git a/lib/src/platform/android/jni/com/github/josxha/maplibre/_package.dart b/maplibre/lib/src/platform/android/jni/com/github/josxha/maplibre/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/com/github/josxha/maplibre/_package.dart
rename to maplibre/lib/src/platform/android/jni/com/github/josxha/maplibre/_package.dart
diff --git a/lib/src/platform/android/jni/com/google/gson/Gson.dart b/maplibre/lib/src/platform/android/jni/com/google/gson/Gson.dart
similarity index 100%
rename from lib/src/platform/android/jni/com/google/gson/Gson.dart
rename to maplibre/lib/src/platform/android/jni/com/google/gson/Gson.dart
diff --git a/lib/src/platform/android/jni/com/google/gson/JsonObject.dart b/maplibre/lib/src/platform/android/jni/com/google/gson/JsonObject.dart
similarity index 100%
rename from lib/src/platform/android/jni/com/google/gson/JsonObject.dart
rename to maplibre/lib/src/platform/android/jni/com/google/gson/JsonObject.dart
diff --git a/lib/src/platform/android/jni/com/google/gson/_package.dart b/maplibre/lib/src/platform/android/jni/com/google/gson/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/com/google/gson/_package.dart
rename to maplibre/lib/src/platform/android/jni/com/google/gson/_package.dart
diff --git a/lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.dart b/maplibre/lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.dart
diff --git a/lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/_package.dart b/maplibre/lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/_package.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/embedding/engine/plugins/activity/_package.dart
diff --git a/lib/src/platform/android/jni/io/flutter/plugin/common/PluginRegistry.dart b/maplibre/lib/src/platform/android/jni/io/flutter/plugin/common/PluginRegistry.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/plugin/common/PluginRegistry.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/plugin/common/PluginRegistry.dart
diff --git a/lib/src/platform/android/jni/io/flutter/plugin/common/_package.dart b/maplibre/lib/src/platform/android/jni/io/flutter/plugin/common/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/plugin/common/_package.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/plugin/common/_package.dart
diff --git a/lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformView.dart b/maplibre/lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformView.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformView.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformView.dart
diff --git a/lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformViewFactory.dart b/maplibre/lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformViewFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformViewFactory.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/plugin/platform/PlatformViewFactory.dart
diff --git a/lib/src/platform/android/jni/io/flutter/plugin/platform/_package.dart b/maplibre/lib/src/platform/android/jni/io/flutter/plugin/platform/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/io/flutter/plugin/platform/_package.dart
rename to maplibre/lib/src/platform/android/jni/io/flutter/plugin/platform/_package.dart
diff --git a/lib/src/platform/android/jni/java/net/URI.dart b/maplibre/lib/src/platform/android/jni/java/net/URI.dart
similarity index 100%
rename from lib/src/platform/android/jni/java/net/URI.dart
rename to maplibre/lib/src/platform/android/jni/java/net/URI.dart
diff --git a/lib/src/platform/android/jni/java/net/URL.dart b/maplibre/lib/src/platform/android/jni/java/net/URL.dart
similarity index 100%
rename from lib/src/platform/android/jni/java/net/URL.dart
rename to maplibre/lib/src/platform/android/jni/java/net/URL.dart
diff --git a/lib/src/platform/android/jni/java/net/_package.dart b/maplibre/lib/src/platform/android/jni/java/net/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/java/net/_package.dart
rename to maplibre/lib/src/platform/android/jni/java/net/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/MapLibre.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/MapLibre.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/MapLibre.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/MapLibre.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/attribution/Attribution.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/Attribution.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/attribution/Attribution.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/Attribution.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionLayout.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionLayout.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionLayout.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionLayout.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionMeasure.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionMeasure.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionMeasure.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionMeasure.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionParser.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionParser.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionParser.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/AttributionParser.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/attribution/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/attribution/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/attribution/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/camera/CameraPosition.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/CameraPosition.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/camera/CameraPosition.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/CameraPosition.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdate.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdate.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdate.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdate.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdateFactory.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdateFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdateFactory.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/CameraUpdateFactory.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/camera/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/camera/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/camera/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/constants/GeometryConstants.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/constants/GeometryConstants.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/constants/GeometryConstants.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/constants/GeometryConstants.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/constants/MapLibreConstants.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/constants/MapLibreConstants.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/constants/MapLibreConstants.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/constants/MapLibreConstants.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/constants/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/constants/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/constants/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/constants/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/CalledFromWorkerThreadException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/CalledFromWorkerThreadException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/CalledFromWorkerThreadException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/CalledFromWorkerThreadException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/ConversionException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/ConversionException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/ConversionException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/ConversionException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/IconBitmapChangedException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/IconBitmapChangedException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/IconBitmapChangedException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/IconBitmapChangedException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidLatLngBoundsException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidLatLngBoundsException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidLatLngBoundsException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidLatLngBoundsException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidMarkerPositionException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidMarkerPositionException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidMarkerPositionException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/InvalidMarkerPositionException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/MapLibreConfigurationException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/MapLibreConfigurationException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/MapLibreConfigurationException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/MapLibreConfigurationException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/TooManyIconsException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/TooManyIconsException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/TooManyIconsException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/TooManyIconsException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/exceptions/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/exceptions/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/exceptions/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLng.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLng.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/LatLng.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLng.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngBounds.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngBounds.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngBounds.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngBounds.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngQuad.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngQuad.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngQuad.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngQuad.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngSpan.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngSpan.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngSpan.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/LatLngSpan.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/ProjectedMeters.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/ProjectedMeters.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/ProjectedMeters.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/ProjectedMeters.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/VisibleRegion.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/VisibleRegion.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/VisibleRegion.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/VisibleRegion.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/geometry/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/geometry/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/geometry/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/HttpIdentifier.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpIdentifier.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/HttpIdentifier.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpIdentifier.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/HttpLogger.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpLogger.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/HttpLogger.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpLogger.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/HttpRequest.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpRequest.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/HttpRequest.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpRequest.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/HttpRequestUrl.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpRequestUrl.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/HttpRequestUrl.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpRequestUrl.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/HttpResponder.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpResponder.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/HttpResponder.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/HttpResponder.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/LocalRequestTask.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/LocalRequestTask.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/LocalRequestTask.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/LocalRequestTask.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/NativeHttpRequest.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/NativeHttpRequest.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/NativeHttpRequest.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/NativeHttpRequest.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/http/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/http/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/http/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/http/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/CompassEngine.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/CompassEngine.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/CompassEngine.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/CompassEngine.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/CompassListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/CompassListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/CompassListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/CompassListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponent.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponent.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/LocationComponent.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponent.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentActivationOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentActivationOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentActivationOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentActivationOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentConstants.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentConstants.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentConstants.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentConstants.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/LocationComponentOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimator.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimator.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimator.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimator.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimatorListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimatorListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimatorListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/MapLibreAnimatorListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/MapLibrePaddingAnimator.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/MapLibrePaddingAnimator.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/MapLibrePaddingAnimator.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/MapLibrePaddingAnimator.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/OnCameraTrackingChangedListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnCameraTrackingChangedListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/OnCameraTrackingChangedListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnCameraTrackingChangedListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationCameraTransitionListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationCameraTransitionListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/OnLocationCameraTransitionListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationCameraTransitionListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationClickListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationClickListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/OnLocationClickListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationClickListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationLongClickListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationLongClickListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/OnLocationLongClickListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationLongClickListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationStaleListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationStaleListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/OnLocationStaleListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnLocationStaleListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/OnRenderModeChangedListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnRenderModeChangedListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/OnRenderModeChangedListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/OnRenderModeChangedListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/PaddingEvaluator.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/PaddingEvaluator.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/PaddingEvaluator.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/PaddingEvaluator.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/PulsingLocationCircleAnimator.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/PulsingLocationCircleAnimator.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/PulsingLocationCircleAnimator.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/PulsingLocationCircleAnimator.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/Utils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/Utils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/Utils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/Utils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/AndroidLocationEngineImpl.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/AndroidLocationEngineImpl.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/AndroidLocationEngineImpl.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/AndroidLocationEngineImpl.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngine.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngine.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngine.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngine.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineCallback.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineCallback.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineCallback.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineCallback.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineDefault.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineDefault.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineDefault.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineDefault.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineImpl.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineImpl.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineImpl.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineImpl.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineProxy.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineProxy.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineProxy.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineProxy.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineRequest.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineRequest.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineRequest.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineRequest.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineResult.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineResult.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineResult.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/LocationEngineResult.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/engine/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/engine/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/engine/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/modes/CameraMode.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/modes/CameraMode.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/modes/CameraMode.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/modes/CameraMode.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/modes/RenderMode.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/modes/RenderMode.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/modes/RenderMode.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/modes/RenderMode.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/modes/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/modes/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/modes/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/modes/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsManager.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsManager.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsManager.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/permissions/PermissionsManager.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/location/permissions/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/location/permissions/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/location/permissions/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/location/permissions/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/log/Logger.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/log/Logger.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/log/Logger.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/log/Logger.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/log/LoggerDefinition.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/log/LoggerDefinition.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/log/LoggerDefinition.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/log/LoggerDefinition.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/log/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/log/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/log/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/log/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/AttributionDialogManager.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/AttributionDialogManager.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/AttributionDialogManager.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/AttributionDialogManager.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/FocalPointChangeListener.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/FocalPointChangeListener.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/FocalPointChangeListener.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/FocalPointChangeListener.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/Image.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Image.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/Image.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Image.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/ImageContent.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/ImageContent.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/ImageContent.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/ImageContent.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/ImageStretches.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/ImageStretches.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/ImageStretches.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/ImageStretches.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/MapFragment.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapFragment.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/MapFragment.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapFragment.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMap.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMap.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMap.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMap.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMapOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMapOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMapOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapLibreMapOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/MapView.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapView.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/MapView.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/MapView.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapView.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapView.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapView.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/NativeMapView.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/OnMapReadyCallback.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/OnMapReadyCallback.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/OnMapReadyCallback.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/OnMapReadyCallback.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/Projection.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Projection.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/Projection.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Projection.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/RenderingStats.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/RenderingStats.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/RenderingStats.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/RenderingStats.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/Style.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Style.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/Style.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Style.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/SupportMapFragment.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/SupportMapFragment.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/SupportMapFragment.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/SupportMapFragment.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/Transform.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Transform.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/Transform.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/Transform.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/UiSettings.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/UiSettings.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/UiSettings.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/UiSettings.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRenderer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRenderer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRenderer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRenderer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererFactory.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererFactory.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererFactory.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererScheduler.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererScheduler.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererScheduler.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/MapRendererScheduler.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLContextFactory.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLContextFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLContextFactory.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLContextFactory.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/egl/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/GLSurfaceViewMapRenderer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/GLSurfaceViewMapRenderer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/GLSurfaceViewMapRenderer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/GLSurfaceViewMapRenderer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreGLSurfaceView.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreGLSurfaceView.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreGLSurfaceView.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreGLSurfaceView.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreSurfaceView.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreSurfaceView.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreSurfaceView.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/MapLibreSurfaceView.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/SurfaceViewMapRenderer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/SurfaceViewMapRenderer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/SurfaceViewMapRenderer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/SurfaceViewMapRenderer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/surfaceview/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/GLTextureViewRenderThread.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/GLTextureViewRenderThread.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/GLTextureViewRenderThread.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/GLTextureViewRenderThread.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/renderer/textureview/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/widgets/CompassView.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/widgets/CompassView.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/widgets/CompassView.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/widgets/CompassView.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/maps/widgets/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/widgets/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/maps/widgets/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/maps/widgets/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineGeometryRegionDefinition.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineGeometryRegionDefinition.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineGeometryRegionDefinition.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineGeometryRegionDefinition.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineManager.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineManager.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineManager.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineManager.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegion.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegion.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegion.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegion.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionDefinition.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionDefinition.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionDefinition.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionDefinition.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionError.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionError.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionError.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionError.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionStatus.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionStatus.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionStatus.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineRegionStatus.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/offline/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/offline/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/offline/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/storage/FileSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/storage/FileSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/storage/FileSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/storage/FileSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/storage/Resource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/storage/Resource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/storage/Resource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/storage/Resource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/storage/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/storage/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/storage/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/storage/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/BackgroundLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/BackgroundLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/BackgroundLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/BackgroundLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/CannotAddLayerException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/CannotAddLayerException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/CannotAddLayerException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/CannotAddLayerException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/CircleLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/CircleLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/CircleLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/CircleLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/CustomLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/CustomLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/CustomLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/CustomLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/FillExtrusionLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/FillExtrusionLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/FillExtrusionLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/FillExtrusionLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/FillLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/FillLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/FillLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/FillLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/HeatmapLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/HeatmapLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/HeatmapLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/HeatmapLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/HillshadeLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/HillshadeLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/HillshadeLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/HillshadeLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/Layer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/Layer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/Layer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/Layer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/LayoutPropertyValue.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/LayoutPropertyValue.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/LayoutPropertyValue.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/LayoutPropertyValue.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/LineLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/LineLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/LineLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/LineLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/PaintPropertyValue.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/PaintPropertyValue.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/PaintPropertyValue.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/PaintPropertyValue.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/Property.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/Property.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/Property.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/Property.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyFactory.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyFactory.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyFactory.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyFactory.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyValue.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyValue.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyValue.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/PropertyValue.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/RasterLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/RasterLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/RasterLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/RasterLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/SymbolLayer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/SymbolLayer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/SymbolLayer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/SymbolLayer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/TransitionOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/TransitionOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/TransitionOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/TransitionOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/layers/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/layers/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/layers/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/light/Light.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/light/Light.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/light/Light.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/light/Light.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/light/Position.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/light/Position.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/light/Position.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/light/Position.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/light/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/light/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/light/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/light/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/CannotAddSourceException.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/CannotAddSourceException.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/CannotAddSourceException.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/CannotAddSourceException.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySourceOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySourceOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySourceOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/CustomGeometrySourceOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeoJsonSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeometryTileProvider.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeometryTileProvider.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/GeometryTileProvider.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/GeometryTileProvider.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/ImageSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/ImageSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/ImageSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/ImageSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterDemSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterDemSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterDemSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterDemSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/RasterSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/Source.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/Source.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/Source.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/Source.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/TileSet.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/TileSet.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/TileSet.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/TileSet.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/UnknownSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/UnknownSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/UnknownSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/UnknownSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/VectorSource.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/VectorSource.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/VectorSource.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/VectorSource.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/sources/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/sources/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/sources/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/types/Formatted.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/types/Formatted.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/types/Formatted.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/types/Formatted.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/types/FormattedSection.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/types/FormattedSection.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/types/FormattedSection.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/types/FormattedSection.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/style/types/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/style/types/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/style/types/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/style/types/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/text/LocalGlyphRasterizer.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/text/LocalGlyphRasterizer.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/text/LocalGlyphRasterizer.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/text/LocalGlyphRasterizer.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/text/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/text/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/text/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/text/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/util/DefaultStyle.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/util/DefaultStyle.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/util/DefaultStyle.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/util/DefaultStyle.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/util/TileServerOptions.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/util/TileServerOptions.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/util/TileServerOptions.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/util/TileServerOptions.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/util/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/util/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/util/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/util/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/AnimatorUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/AnimatorUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/AnimatorUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/AnimatorUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/BitmapUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/BitmapUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/BitmapUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/BitmapUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/ColorUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/ColorUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/ColorUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/ColorUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/Compare.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/Compare.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/Compare.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/Compare.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/ExtensionsKt.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/ExtensionsKt.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/ExtensionsKt.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/ExtensionsKt.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/FileUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/FileUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/FileUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/FileUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/FontUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/FontUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/FontUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/FontUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/MapFragmentUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/MapFragmentUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/MapFragmentUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/MapFragmentUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/MathUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/MathUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/MathUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/MathUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/ThreadUtils.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/ThreadUtils.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/ThreadUtils.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/ThreadUtils.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/android/utils/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/android/utils/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/android/utils/_package.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/geojson/Feature.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/geojson/Feature.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/geojson/Feature.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/geojson/Feature.dart
diff --git a/lib/src/platform/android/jni/org/maplibre/geojson/_package.dart b/maplibre/lib/src/platform/android/jni/org/maplibre/geojson/_package.dart
similarity index 100%
rename from lib/src/platform/android/jni/org/maplibre/geojson/_package.dart
rename to maplibre/lib/src/platform/android/jni/org/maplibre/geojson/_package.dart
diff --git a/lib/src/platform/android/map_state.dart b/maplibre/lib/src/platform/android/map_state.dart
similarity index 100%
rename from lib/src/platform/android/map_state.dart
rename to maplibre/lib/src/platform/android/map_state.dart
diff --git a/lib/src/platform/android/offline_manager.dart b/maplibre/lib/src/platform/android/offline_manager.dart
similarity index 100%
rename from lib/src/platform/android/offline_manager.dart
rename to maplibre/lib/src/platform/android/offline_manager.dart
diff --git a/lib/src/platform/android/permission_manager.dart b/maplibre/lib/src/platform/android/permission_manager.dart
similarity index 100%
rename from lib/src/platform/android/permission_manager.dart
rename to maplibre/lib/src/platform/android/permission_manager.dart
diff --git a/lib/src/platform/android/registry.dart b/maplibre/lib/src/platform/android/registry.dart
similarity index 100%
rename from lib/src/platform/android/registry.dart
rename to maplibre/lib/src/platform/android/registry.dart
diff --git a/lib/src/platform/android/style_controller.dart b/maplibre/lib/src/platform/android/style_controller.dart
similarity index 100%
rename from lib/src/platform/android/style_controller.dart
rename to maplibre/lib/src/platform/android/style_controller.dart
diff --git a/lib/src/platform/ios/extensions.dart b/maplibre/lib/src/platform/ios/extensions.dart
similarity index 100%
rename from lib/src/platform/ios/extensions.dart
rename to maplibre/lib/src/platform/ios/extensions.dart
diff --git a/lib/src/platform/ios/map_state.dart b/maplibre/lib/src/platform/ios/map_state.dart
similarity index 100%
rename from lib/src/platform/ios/map_state.dart
rename to maplibre/lib/src/platform/ios/map_state.dart
diff --git a/lib/src/platform/ios/offline_manager.dart b/maplibre/lib/src/platform/ios/offline_manager.dart
similarity index 100%
rename from lib/src/platform/ios/offline_manager.dart
rename to maplibre/lib/src/platform/ios/offline_manager.dart
diff --git a/lib/src/platform/ios/permission_manager.dart b/maplibre/lib/src/platform/ios/permission_manager.dart
similarity index 100%
rename from lib/src/platform/ios/permission_manager.dart
rename to maplibre/lib/src/platform/ios/permission_manager.dart
diff --git a/lib/src/platform/ios/style_controller.dart b/maplibre/lib/src/platform/ios/style_controller.dart
similarity index 100%
rename from lib/src/platform/ios/style_controller.dart
rename to maplibre/lib/src/platform/ios/style_controller.dart
diff --git a/lib/src/platform/map_state_native.dart b/maplibre/lib/src/platform/map_state_native.dart
similarity index 100%
rename from lib/src/platform/map_state_native.dart
rename to maplibre/lib/src/platform/map_state_native.dart
diff --git a/lib/src/platform/offline_manager_native.dart b/maplibre/lib/src/platform/offline_manager_native.dart
similarity index 100%
rename from lib/src/platform/offline_manager_native.dart
rename to maplibre/lib/src/platform/offline_manager_native.dart
diff --git a/lib/src/platform/pigeon.g.dart b/maplibre/lib/src/platform/pigeon.g.dart
similarity index 100%
rename from lib/src/platform/pigeon.g.dart
rename to maplibre/lib/src/platform/pigeon.g.dart
diff --git a/lib/src/platform/platform_native.dart b/maplibre/lib/src/platform/platform_native.dart
similarity index 100%
rename from lib/src/platform/platform_native.dart
rename to maplibre/lib/src/platform/platform_native.dart
diff --git a/lib/src/platform/platform_web.dart b/maplibre/lib/src/platform/platform_web.dart
similarity index 100%
rename from lib/src/platform/platform_web.dart
rename to maplibre/lib/src/platform/platform_web.dart
diff --git a/lib/src/platform/web/extensions.dart b/maplibre/lib/src/platform/web/extensions.dart
similarity index 100%
rename from lib/src/platform/web/extensions.dart
rename to maplibre/lib/src/platform/web/extensions.dart
diff --git a/lib/src/platform/web/interop/camera.dart b/maplibre/lib/src/platform/web/interop/camera.dart
similarity index 100%
rename from lib/src/platform/web/interop/camera.dart
rename to maplibre/lib/src/platform/web/interop/camera.dart
diff --git a/lib/src/platform/web/interop/events.dart b/maplibre/lib/src/platform/web/interop/events.dart
similarity index 100%
rename from lib/src/platform/web/interop/events.dart
rename to maplibre/lib/src/platform/web/interop/events.dart
diff --git a/lib/src/platform/web/interop/gesture_handlers.dart b/maplibre/lib/src/platform/web/interop/gesture_handlers.dart
similarity index 100%
rename from lib/src/platform/web/interop/gesture_handlers.dart
rename to maplibre/lib/src/platform/web/interop/gesture_handlers.dart
diff --git a/lib/src/platform/web/interop/interop.dart b/maplibre/lib/src/platform/web/interop/interop.dart
similarity index 100%
rename from lib/src/platform/web/interop/interop.dart
rename to maplibre/lib/src/platform/web/interop/interop.dart
diff --git a/lib/src/platform/web/interop/json.dart b/maplibre/lib/src/platform/web/interop/json.dart
similarity index 100%
rename from lib/src/platform/web/interop/json.dart
rename to maplibre/lib/src/platform/web/interop/json.dart
diff --git a/lib/src/platform/web/interop/map.dart b/maplibre/lib/src/platform/web/interop/map.dart
similarity index 100%
rename from lib/src/platform/web/interop/map.dart
rename to maplibre/lib/src/platform/web/interop/map.dart
diff --git a/lib/src/platform/web/interop/map_geojson_feature.dart b/maplibre/lib/src/platform/web/interop/map_geojson_feature.dart
similarity index 100%
rename from lib/src/platform/web/interop/map_geojson_feature.dart
rename to maplibre/lib/src/platform/web/interop/map_geojson_feature.dart
diff --git a/lib/src/platform/web/interop/marker.dart b/maplibre/lib/src/platform/web/interop/marker.dart
similarity index 100%
rename from lib/src/platform/web/interop/marker.dart
rename to maplibre/lib/src/platform/web/interop/marker.dart
diff --git a/lib/src/platform/web/interop/pmtiles.dart b/maplibre/lib/src/platform/web/interop/pmtiles.dart
similarity index 100%
rename from lib/src/platform/web/interop/pmtiles.dart
rename to maplibre/lib/src/platform/web/interop/pmtiles.dart
diff --git a/lib/src/platform/web/interop/style_specification.dart b/maplibre/lib/src/platform/web/interop/style_specification.dart
similarity index 100%
rename from lib/src/platform/web/interop/style_specification.dart
rename to maplibre/lib/src/platform/web/interop/style_specification.dart
diff --git a/lib/src/platform/web/map_state.dart b/maplibre/lib/src/platform/web/map_state.dart
similarity index 100%
rename from lib/src/platform/web/map_state.dart
rename to maplibre/lib/src/platform/web/map_state.dart
diff --git a/lib/src/platform/web/style_controller.dart b/maplibre/lib/src/platform/web/style_controller.dart
similarity index 100%
rename from lib/src/platform/web/style_controller.dart
rename to maplibre/lib/src/platform/web/style_controller.dart
diff --git a/lib/src/platform_interface.dart b/maplibre/lib/src/platform_interface.dart
similarity index 100%
rename from lib/src/platform_interface.dart
rename to maplibre/lib/src/platform_interface.dart
diff --git a/lib/src/queried_layer.dart b/maplibre/lib/src/queried_layer.dart
similarity index 100%
rename from lib/src/queried_layer.dart
rename to maplibre/lib/src/queried_layer.dart
diff --git a/lib/src/style/layers/background_style_layer.dart b/maplibre/lib/src/style/layers/background_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/background_style_layer.dart
rename to maplibre/lib/src/style/layers/background_style_layer.dart
diff --git a/lib/src/style/layers/circle_style_layer.dart b/maplibre/lib/src/style/layers/circle_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/circle_style_layer.dart
rename to maplibre/lib/src/style/layers/circle_style_layer.dart
diff --git a/lib/src/style/layers/fill_extrusion_style_layer.dart b/maplibre/lib/src/style/layers/fill_extrusion_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/fill_extrusion_style_layer.dart
rename to maplibre/lib/src/style/layers/fill_extrusion_style_layer.dart
diff --git a/lib/src/style/layers/fill_style_layer.dart b/maplibre/lib/src/style/layers/fill_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/fill_style_layer.dart
rename to maplibre/lib/src/style/layers/fill_style_layer.dart
diff --git a/lib/src/style/layers/heatmap_style_layer.dart b/maplibre/lib/src/style/layers/heatmap_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/heatmap_style_layer.dart
rename to maplibre/lib/src/style/layers/heatmap_style_layer.dart
diff --git a/lib/src/style/layers/hillshade_style_layer.dart b/maplibre/lib/src/style/layers/hillshade_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/hillshade_style_layer.dart
rename to maplibre/lib/src/style/layers/hillshade_style_layer.dart
diff --git a/lib/src/style/layers/line_style_layer.dart b/maplibre/lib/src/style/layers/line_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/line_style_layer.dart
rename to maplibre/lib/src/style/layers/line_style_layer.dart
diff --git a/lib/src/style/layers/raster_style_layer.dart b/maplibre/lib/src/style/layers/raster_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/raster_style_layer.dart
rename to maplibre/lib/src/style/layers/raster_style_layer.dart
diff --git a/lib/src/style/layers/style_layer.dart b/maplibre/lib/src/style/layers/style_layer.dart
similarity index 100%
rename from lib/src/style/layers/style_layer.dart
rename to maplibre/lib/src/style/layers/style_layer.dart
diff --git a/lib/src/style/layers/symbol_style_layer.dart b/maplibre/lib/src/style/layers/symbol_style_layer.dart
similarity index 100%
rename from lib/src/style/layers/symbol_style_layer.dart
rename to maplibre/lib/src/style/layers/symbol_style_layer.dart
diff --git a/lib/src/style/sources/geo_json_source.dart b/maplibre/lib/src/style/sources/geo_json_source.dart
similarity index 100%
rename from lib/src/style/sources/geo_json_source.dart
rename to maplibre/lib/src/style/sources/geo_json_source.dart
diff --git a/lib/src/style/sources/image_source.dart b/maplibre/lib/src/style/sources/image_source.dart
similarity index 100%
rename from lib/src/style/sources/image_source.dart
rename to maplibre/lib/src/style/sources/image_source.dart
diff --git a/lib/src/style/sources/raster_dem_source.dart b/maplibre/lib/src/style/sources/raster_dem_source.dart
similarity index 100%
rename from lib/src/style/sources/raster_dem_source.dart
rename to maplibre/lib/src/style/sources/raster_dem_source.dart
diff --git a/lib/src/style/sources/raster_source.dart b/maplibre/lib/src/style/sources/raster_source.dart
similarity index 100%
rename from lib/src/style/sources/raster_source.dart
rename to maplibre/lib/src/style/sources/raster_source.dart
diff --git a/lib/src/style/sources/source.dart b/maplibre/lib/src/style/sources/source.dart
similarity index 100%
rename from lib/src/style/sources/source.dart
rename to maplibre/lib/src/style/sources/source.dart
diff --git a/lib/src/style/sources/vector_source.dart b/maplibre/lib/src/style/sources/vector_source.dart
similarity index 100%
rename from lib/src/style/sources/vector_source.dart
rename to maplibre/lib/src/style/sources/vector_source.dart
diff --git a/lib/src/style/sources/video_source.dart b/maplibre/lib/src/style/sources/video_source.dart
similarity index 100%
rename from lib/src/style/sources/video_source.dart
rename to maplibre/lib/src/style/sources/video_source.dart
diff --git a/lib/src/style/style.dart b/maplibre/lib/src/style/style.dart
similarity index 100%
rename from lib/src/style/style.dart
rename to maplibre/lib/src/style/style.dart
diff --git a/lib/src/style_controller.dart b/maplibre/lib/src/style_controller.dart
similarity index 100%
rename from lib/src/style_controller.dart
rename to maplibre/lib/src/style_controller.dart
diff --git a/lib/src/translucent_pointer.dart b/maplibre/lib/src/translucent_pointer.dart
similarity index 100%
rename from lib/src/translucent_pointer.dart
rename to maplibre/lib/src/translucent_pointer.dart
diff --git a/lib/src/ui/map_compass.dart b/maplibre/lib/src/ui/map_compass.dart
similarity index 100%
rename from lib/src/ui/map_compass.dart
rename to maplibre/lib/src/ui/map_compass.dart
diff --git a/lib/src/ui/map_control_buttons.dart b/maplibre/lib/src/ui/map_control_buttons.dart
similarity index 100%
rename from lib/src/ui/map_control_buttons.dart
rename to maplibre/lib/src/ui/map_control_buttons.dart
diff --git a/lib/src/ui/map_scalebar.dart b/maplibre/lib/src/ui/map_scalebar.dart
similarity index 100%
rename from lib/src/ui/map_scalebar.dart
rename to maplibre/lib/src/ui/map_scalebar.dart
diff --git a/lib/src/ui/source_attribution.dart b/maplibre/lib/src/ui/source_attribution.dart
similarity index 100%
rename from lib/src/ui/source_attribution.dart
rename to maplibre/lib/src/ui/source_attribution.dart
diff --git a/lib/src/utils.dart b/maplibre/lib/src/utils.dart
similarity index 100%
rename from lib/src/utils.dart
rename to maplibre/lib/src/utils.dart
diff --git a/lib/src/widget_layer.dart b/maplibre/lib/src/widget_layer.dart
similarity index 100%
rename from lib/src/widget_layer.dart
rename to maplibre/lib/src/widget_layer.dart
diff --git a/linux/CMakeLists.txt b/maplibre/linux/CMakeLists.txt
similarity index 100%
rename from linux/CMakeLists.txt
rename to maplibre/linux/CMakeLists.txt
diff --git a/linux/include/maplibre/maplibre_plugin.h b/maplibre/linux/include/maplibre/maplibre_plugin.h
similarity index 100%
rename from linux/include/maplibre/maplibre_plugin.h
rename to maplibre/linux/include/maplibre/maplibre_plugin.h
diff --git a/linux/maplibre_plugin.cc b/maplibre/linux/maplibre_plugin.cc
similarity index 100%
rename from linux/maplibre_plugin.cc
rename to maplibre/linux/maplibre_plugin.cc
diff --git a/linux/maplibre_plugin_private.h b/maplibre/linux/maplibre_plugin_private.h
similarity index 100%
rename from linux/maplibre_plugin_private.h
rename to maplibre/linux/maplibre_plugin_private.h
diff --git a/linux/test/maplibre_plugin_test.cc b/maplibre/linux/test/maplibre_plugin_test.cc
similarity index 100%
rename from linux/test/maplibre_plugin_test.cc
rename to maplibre/linux/test/maplibre_plugin_test.cc
diff --git a/macos/Classes/MaplibrePlugin.swift b/maplibre/macos/Classes/MaplibrePlugin.swift
similarity index 100%
rename from macos/Classes/MaplibrePlugin.swift
rename to maplibre/macos/Classes/MaplibrePlugin.swift
diff --git a/macos/Resources/PrivacyInfo.xcprivacy b/maplibre/macos/Resources/PrivacyInfo.xcprivacy
similarity index 100%
rename from macos/Resources/PrivacyInfo.xcprivacy
rename to maplibre/macos/Resources/PrivacyInfo.xcprivacy
diff --git a/macos/maplibre.podspec b/maplibre/macos/maplibre.podspec
similarity index 100%
rename from macos/maplibre.podspec
rename to maplibre/macos/maplibre.podspec
diff --git a/macos/maplibre/Package.swift b/maplibre/macos/maplibre/Package.swift
similarity index 100%
rename from macos/maplibre/Package.swift
rename to maplibre/macos/maplibre/Package.swift
diff --git a/macos/maplibre/Sources/maplibre/MaplibrePlugin.swift b/maplibre/macos/maplibre/Sources/maplibre/MaplibrePlugin.swift
similarity index 100%
rename from macos/maplibre/Sources/maplibre/MaplibrePlugin.swift
rename to maplibre/macos/maplibre/Sources/maplibre/MaplibrePlugin.swift
diff --git a/macos/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy b/maplibre/macos/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy
similarity index 100%
rename from macos/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy
rename to maplibre/macos/maplibre/Sources/maplibre/PrivacyInfo.xcprivacy
diff --git a/maplibre/pubspec.yaml b/maplibre/pubspec.yaml
new file mode 100644
index 00000000..0b71bda0
--- /dev/null
+++ b/maplibre/pubspec.yaml
@@ -0,0 +1,67 @@
+name: maplibre
+description: "Permissive and performant mapping library that supports Mapbox Vector Tiles (MVT) powered by MapLibre SDKs."
+version: 0.3.1
+repository: https://github.com/josxha/flutter-maplibre
+issue_tracker: https://github.com/josxha/flutter-maplibre/issues
+homepage: https://flutter-maplibre.pages.dev
+documentation: https://flutter-maplibre.pages.dev/docs/index/
+
+topics: [ map, maplibre, mvt ]
+
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
+
+resolution: workspace
+
+platforms:
+  android:
+  ios:
+  web:
+
+environment:
+  sdk: '>=3.9.0 <4.0.0'
+  flutter: '>=3.35.0'
+
+dependencies:
+  ffi: ^2.1.3
+  flutter:
+    sdk: flutter
+  flutter_web_plugins:
+    sdk: flutter
+  geobase: ^1.5.0
+  html: ^0.15.4
+  jni: ^0.14.2
+  maplibre_ios: ^0.3.1
+  objective_c: ^8.0.0
+  pointer_interceptor: ^0.10.1+2
+  url_launcher: ^6.3.0
+  web: ^1.0.0
+
+dev_dependencies:
+  build_runner: ^2.4.11
+  flutter_test:
+    sdk: flutter
+  jnigen: 0.14.2
+  mocktail: ^1.0.4
+  very_good_analysis: ^10.0.0
+
+screenshots:
+  - description: 'MapLibre Logo'
+    path: 'doc/logo_rounded.png'
+
+flutter:
+  plugin:
+    platforms:
+      android:
+        package: com.github.josxha.maplibre
+        pluginClass: MapLibrePlugin
+      linux:
+        pluginClass: MaplibrePlugin
+      macos:
+        pluginClass: MaplibrePlugin
+      windows:
+        pluginClass: MaplibrePluginCApi
+      web:
+        pluginClass: PlatformImpl
+        fileName: src/platform/platform_web.dart
diff --git a/run_jnigen.ps1 b/maplibre/run_jnigen.ps1
similarity index 100%
rename from run_jnigen.ps1
rename to maplibre/run_jnigen.ps1
diff --git a/run_jnigen.sh b/maplibre/run_jnigen.sh
old mode 100755
new mode 100644
similarity index 100%
rename from run_jnigen.sh
rename to maplibre/run_jnigen.sh
diff --git a/test/annotation/annotation_manager_test.dart b/maplibre/test/annotation/annotation_manager_test.dart
similarity index 100%
rename from test/annotation/annotation_manager_test.dart
rename to maplibre/test/annotation/annotation_manager_test.dart
diff --git a/test/annotation/models_test.dart b/maplibre/test/annotation/models_test.dart
similarity index 100%
rename from test/annotation/models_test.dart
rename to maplibre/test/annotation/models_test.dart
diff --git a/test/dependency_injection.dart b/maplibre/test/dependency_injection.dart
similarity index 100%
rename from test/dependency_injection.dart
rename to maplibre/test/dependency_injection.dart
diff --git a/test/models_test.dart b/maplibre/test/models_test.dart
similarity index 100%
rename from test/models_test.dart
rename to maplibre/test/models_test.dart
diff --git a/test/shared/annotation_app.dart b/maplibre/test/shared/annotation_app.dart
similarity index 100%
rename from test/shared/annotation_app.dart
rename to maplibre/test/shared/annotation_app.dart
diff --git a/test/shared/mocks.dart b/maplibre/test/shared/mocks.dart
similarity index 100%
rename from test/shared/mocks.dart
rename to maplibre/test/shared/mocks.dart
diff --git a/test/shared/ui_app.dart b/maplibre/test/shared/ui_app.dart
similarity index 100%
rename from test/shared/ui_app.dart
rename to maplibre/test/shared/ui_app.dart
diff --git a/test/style/layer/models_test.dart b/maplibre/test/style/layer/models_test.dart
similarity index 100%
rename from test/style/layer/models_test.dart
rename to maplibre/test/style/layer/models_test.dart
diff --git a/test/style/source/models_test.dart b/maplibre/test/style/source/models_test.dart
similarity index 100%
rename from test/style/source/models_test.dart
rename to maplibre/test/style/source/models_test.dart
diff --git a/test/ui/map_compass_test.dart b/maplibre/test/ui/map_compass_test.dart
similarity index 100%
rename from test/ui/map_compass_test.dart
rename to maplibre/test/ui/map_compass_test.dart
diff --git a/test/ui/map_control_buttons_test.dart b/maplibre/test/ui/map_control_buttons_test.dart
similarity index 100%
rename from test/ui/map_control_buttons_test.dart
rename to maplibre/test/ui/map_control_buttons_test.dart
diff --git a/test/ui/map_scalebar_test.dart b/maplibre/test/ui/map_scalebar_test.dart
similarity index 100%
rename from test/ui/map_scalebar_test.dart
rename to maplibre/test/ui/map_scalebar_test.dart
diff --git a/test/ui/source_attribution_test.dart b/maplibre/test/ui/source_attribution_test.dart
similarity index 100%
rename from test/ui/source_attribution_test.dart
rename to maplibre/test/ui/source_attribution_test.dart
diff --git a/test/widget_layer_test.dart b/maplibre/test/widget_layer_test.dart
similarity index 100%
rename from test/widget_layer_test.dart
rename to maplibre/test/widget_layer_test.dart
diff --git a/windows/.gitignore b/maplibre/windows/.gitignore
similarity index 100%
rename from windows/.gitignore
rename to maplibre/windows/.gitignore
diff --git a/windows/CMakeLists.txt b/maplibre/windows/CMakeLists.txt
similarity index 100%
rename from windows/CMakeLists.txt
rename to maplibre/windows/CMakeLists.txt
diff --git a/windows/include/maplibre/maplibre_plugin_c_api.h b/maplibre/windows/include/maplibre/maplibre_plugin_c_api.h
similarity index 100%
rename from windows/include/maplibre/maplibre_plugin_c_api.h
rename to maplibre/windows/include/maplibre/maplibre_plugin_c_api.h
diff --git a/windows/maplibre_plugin.cpp b/maplibre/windows/maplibre_plugin.cpp
similarity index 100%
rename from windows/maplibre_plugin.cpp
rename to maplibre/windows/maplibre_plugin.cpp
diff --git a/windows/maplibre_plugin.h b/maplibre/windows/maplibre_plugin.h
similarity index 100%
rename from windows/maplibre_plugin.h
rename to maplibre/windows/maplibre_plugin.h
diff --git a/windows/maplibre_plugin_c_api.cpp b/maplibre/windows/maplibre_plugin_c_api.cpp
similarity index 100%
rename from windows/maplibre_plugin_c_api.cpp
rename to maplibre/windows/maplibre_plugin_c_api.cpp
diff --git a/windows/test/maplibre_plugin_test.cpp b/maplibre/windows/test/maplibre_plugin_test.cpp
similarity index 100%
rename from windows/test/maplibre_plugin_test.cpp
rename to maplibre/windows/test/maplibre_plugin_test.cpp
diff --git a/maplibre_ios/analysis_options.yaml b/maplibre_ios/analysis_options.yaml
index 1fa06a20..169d741f 100644
--- a/maplibre_ios/analysis_options.yaml
+++ b/maplibre_ios/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: ../analysis_options.yaml
+include: ../maplibre/analysis_options.yaml
 
 linter:
   rules:
diff --git a/maplibre_ios/example/analysis_options.yaml b/maplibre_ios/example/analysis_options.yaml
index 6a49a196..1fa06a20 100644
--- a/maplibre_ios/example/analysis_options.yaml
+++ b/maplibre_ios/example/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: ../../analysis_options.yaml
+include: ../analysis_options.yaml
 
 linter:
   rules:
diff --git a/pigeons/pigeon.dart b/pigeons/pigeon.dart
index 4c1a8073..25af7045 100644
--- a/pigeons/pigeon.dart
+++ b/pigeons/pigeon.dart
@@ -2,7 +2,7 @@ import 'package:pigeon/pigeon.dart';
 
 @ConfigurePigeon(
   PigeonOptions(
-    dartOut: 'lib/src/platform/pigeon.g.dart',
+    dartOut: 'maplibre/lib/src/platform/pigeon.g.dart',
     dartOptions: DartOptions(),
     dartPackageName: 'maplibre',
     copyrightHeader: 'pigeons/header.txt',
diff --git a/pigeons/run_code_gen.sh b/pigeons/run_code_gen.sh
old mode 100755
new mode 100644
diff --git a/pubspec.yaml b/pubspec.yaml
index 88da400c..ca7e0dcb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,71 +1,20 @@
-name: maplibre
-description: "Permissive and performant mapping library that supports Mapbox Vector Tiles (MVT) powered by MapLibre SDKs."
-version: 0.3.1
+name: flutter_maplibre
+description: Pub workspace package for Flutter MapLibre.
+version: 1.0.0
 repository: https://github.com/josxha/flutter-maplibre
 issue_tracker: https://github.com/josxha/flutter-maplibre/issues
 homepage: https://flutter-maplibre.pages.dev
 documentation: https://flutter-maplibre.pages.dev/docs/index/
 
-topics: [ map, maplibre, mvt ]
-
-funding:
-  - https://paypal.me/joschaeckert
-  - https://github.com/sponsors/josxha
-
-platforms:
-  android:
-  ios:
-  web:
-
+publish_to: none
 environment:
   sdk: '>=3.9.0 <4.0.0'
-  flutter: '>=3.35.0'
 
 workspace:
+  - maplibre
   - example
   - maplibre_ios
   - maplibre_ios/example
 
-dependencies:
-  ffi: ^2.1.3
-  flutter:
-    sdk: flutter
-  flutter_web_plugins:
-    sdk: flutter
-  geobase: ^1.5.0
-  html: ^0.15.4
-  jni: ^0.14.2
-  maplibre_ios: ^0.3.1
-  objective_c: ^8.0.0
-  pointer_interceptor: ^0.10.1+2
-  url_launcher: ^6.3.0
-  web: ^1.0.0
-
 dev_dependencies:
-  build_runner: ^2.4.11
-  flutter_test:
-    sdk: flutter
-  jnigen: 0.14.2
-  mocktail: ^1.0.4
-  pigeon: 26.0.1
-  very_good_analysis: ^10.0.0
-
-screenshots:
-  - description: 'MapLibre Logo'
-    path: 'doc/logo_rounded.png'
-
-flutter:
-  plugin:
-    platforms:
-      android:
-        package: com.github.josxha.maplibre
-        pluginClass: MapLibrePlugin
-      linux:
-        pluginClass: MaplibrePlugin
-      macos:
-        pluginClass: MaplibrePlugin
-      windows:
-        pluginClass: MaplibrePluginCApi
-      web:
-        pluginClass: PlatformImpl
-        fileName: src/platform/platform_web.dart
+  pigeon: 26.0.1
\ No newline at end of file