diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build_All.xml
similarity index 85%
rename from .idea/runConfigurations/Build.xml
rename to .idea/runConfigurations/Build_All.xml
index 5eee3b2a..5a2421e3 100644
--- a/.idea/runConfigurations/Build.xml
+++ b/.idea/runConfigurations/Build_All.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+  <configuration default="false" name="Build All" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="command" value="build" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
diff --git a/.idea/runConfigurations/Build_Android.xml b/.idea/runConfigurations/Build_Android.xml
index 3a8fddfb..dcf1e5ce 100644
--- a/.idea/runConfigurations/Build_Android.xml
+++ b/.idea/runConfigurations/Build_Android.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build Android" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="+nightly-2022-02-26 apk build -Zbuild-std" />
+    <option name="command" value="+nightly-2022-02-26 apk build -p maplibre-android -Zbuild-std" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
diff --git a/.idea/runConfigurations/Build_WASM.xml b/.idea/runConfigurations/Build_WASM.xml
index c32ac879..89ecf808 100644
--- a/.idea/runConfigurations/Build_WASM.xml
+++ b/.idea/runConfigurations/Build_WASM.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build WASM" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="build --features web-webgl --lib --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort" />
+    <option name="command" value="build -p maplibre-web --features web-webgl --lib --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
diff --git a/.idea/runConfigurations/Render.xml b/.idea/runConfigurations/Render.xml
index c075c956..fdfe34df 100644
--- a/.idea/runConfigurations/Render.xml
+++ b/.idea/runConfigurations/Render.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Render" type="CargoCommandRunConfiguration" factoryName="Cargo Command" folderName="Benches">
+  <configuration default="false" name="Render" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="command" value="bench --bench render" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
diff --git a/.idea/runConfigurations/Run_desktop__debug_enable_tracing_.xml b/.idea/runConfigurations/Run_desktop__debug_enable_tracing_.xml
index e2f165d2..2e3d0d9d 100644
--- a/.idea/runConfigurations/Run_desktop__debug_enable_tracing_.xml
+++ b/.idea/runConfigurations/Run_desktop__debug_enable_tracing_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run desktop (debug+enable-tracing)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --example  desktop --features enable-tracing" />
+    <option name="command" value="run -p maplibre-example --features enable-tracing" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
diff --git a/.idea/runConfigurations/Run_desktop__release_.xml b/.idea/runConfigurations/Run_desktop__release_.xml
index b32614c6..5530719e 100644
--- a/.idea/runConfigurations/Run_desktop__release_.xml
+++ b/.idea/runConfigurations/Run_desktop__release_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run desktop (release)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --release --example  desktop" />
+    <option name="command" value="run -p maplibre-example --release" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
diff --git a/.idea/runConfigurations/Run_desktop__release_enable_tracing_.xml b/.idea/runConfigurations/Run_desktop__release_enable_tracing_.xml
index 3eb7b509..b0478c8d 100644
--- a/.idea/runConfigurations/Run_desktop__release_enable_tracing_.xml
+++ b/.idea/runConfigurations/Run_desktop__release_enable_tracing_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run desktop (release+enable-tracing)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --release --example  desktop  --features enable-tracing" />
+    <option name="command" value="run -p maplibre-example --release --features enable-tracing" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
diff --git a/.idea/runConfigurations/Run_web__webgl__.xml b/.idea/runConfigurations/Run_web__webgl__.xml
index 1a64fab7..df8ffdd6 100644
--- a/.idea/runConfigurations/Run_web__webgl__.xml
+++ b/.idea/runConfigurations/Run_web__webgl__.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run web (webgl) " type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/web/package.json" />
+    <package-json value="$PROJECT_DIR$/maplibre-web/web/package.json" />
     <command value="run" />
     <scripts>
       <script value="webgl-start" />
diff --git a/.idea/runConfigurations/Run_web__webgpu_.xml b/.idea/runConfigurations/Run_web__webgpu_.xml
index c296598b..9102d86b 100644
--- a/.idea/runConfigurations/Run_web__webgpu_.xml
+++ b/.idea/runConfigurations/Run_web__webgpu_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run web (webgpu)" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/web/package.json" />
+    <package-json value="$PROJECT_DIR$/maplibre-web/web/package.json" />
     <command value="run" />
     <scripts>
       <script value="start" />
diff --git a/.idea/runConfigurations/Tesselation.xml b/.idea/runConfigurations/Tesselation.xml
index ddd7cd1a..7711e736 100644
--- a/.idea/runConfigurations/Tesselation.xml
+++ b/.idea/runConfigurations/Tesselation.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Tesselation" type="CargoCommandRunConfiguration" factoryName="Cargo Command" folderName="Benches">
+  <configuration default="false" name="Tesselation" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="command" value="bench --bench tessellation" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />