diff --git a/BlueMapAPI b/BlueMapAPI
index 158b155a..99804c3a 160000
--- a/BlueMapAPI
+++ b/BlueMapAPI
@@ -1 +1 @@
-Subproject commit 158b155a2c611f52f081daac5d821ae0e0417c79
+Subproject commit 99804c3aae0cb6e748506aa0fb9e0a6996fc4f01
diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java
index e536ac71..03cd8c15 100644
--- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java
+++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java
@@ -3,7 +3,7 @@
 import com.flowpowered.math.vector.Vector2i;
 import de.bluecolored.bluemap.api.BlueMapMap;
 import de.bluecolored.bluemap.api.BlueMapWorld;
-import de.bluecolored.bluemap.api.marker.MarkerSet;
+import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.common.plugin.Plugin;
 import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
 import de.bluecolored.bluemap.common.rendermanager.WorldRegionRenderTask;
diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/live/LiveMarkersDataSupplier.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/live/LiveMarkersDataSupplier.java
index aeb67e42..000ad819 100644
--- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/live/LiveMarkersDataSupplier.java
+++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/live/LiveMarkersDataSupplier.java
@@ -1,7 +1,7 @@
 package de.bluecolored.bluemap.common.live;
 
-import de.bluecolored.bluemap.api.marker.MarkerGson;
-import de.bluecolored.bluemap.api.marker.MarkerSet;
+import de.bluecolored.bluemap.api.markers.MarkerGson;
+import de.bluecolored.bluemap.api.markers.MarkerSet;
 
 import java.util.Map;
 import java.util.function.Supplier;
diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/MapRequestHandler.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/MapRequestHandler.java
index 02db08fd..f348e7da 100644
--- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/MapRequestHandler.java
+++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/MapRequestHandler.java
@@ -1,6 +1,6 @@
 package de.bluecolored.bluemap.common.web;
 
-import de.bluecolored.bluemap.api.marker.MarkerSet;
+import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.common.config.PluginConfig;
 import de.bluecolored.bluemap.common.live.LiveMarkersDataSupplier;
 import de.bluecolored.bluemap.common.live.LivePlayersDataSupplier;
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/BmMap.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/BmMap.java
index 020b7351..c82ee218 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/BmMap.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/BmMap.java
@@ -25,7 +25,7 @@
 package de.bluecolored.bluemap.core.map;
 
 import com.flowpowered.math.vector.Vector2i;
-import de.bluecolored.bluemap.api.marker.MarkerSet;
+import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.api.debug.DebugDump;
 import de.bluecolored.bluemap.core.logger.Logger;
 import de.bluecolored.bluemap.core.map.hires.HiresModelManager;