diff --git a/README.md b/README.md
index eff4323..bcb0400 100644
--- a/README.md
+++ b/README.md
@@ -39,51 +39,16 @@ Here is an overview of the different marker sets, and what they are meant for.
 
 ## How to add a point marker
 
-1. Find the correct marker set directory in `src/marker_sets`.
-2. Create a new file in this directory with the name of the marker and the extension `.py`.
-   Note that this needs to be underscored (no spaces or hyphens), and valid ascii.
-   e.g. `Min svære base` -> `min_svaere_base.py`
-3. Add the marker to the file. You can use the following template or look at other markers for inspiration.
-
-```python
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Nyverdenhytta",
-        icon = None,
-        x = 848,
-        y = 70,
-        z = 1583,
-    ),
-]
-```
-
-4. Register the marker(s) to the marker set by editing the marker set's `__init__.py` file.
-   Add the following line to the file, replacing `<marker_name>` with the name of the marker file.
-   Notice that there needs to be a `*` before the marker name inside the `markers` list.
-
-```python
-  ...
-
-  from .<marker_name> import MARKERS as <marker_name>_markers
-
-  ...
-
-  markers = [
-    ...
-    *<marker_name>_markers,
-  ]
-```
-
-5. Run the cli tool to verify that the marker has been added correctly.
+1. Find the correct marker set file in `src/marker_sets/<world>`.
+2. Add the marker to the list in the file. You can look at neighbouring markers for inspiration.
+3. Run the cli tool to verify that the marker has been added correctly.
 
 ```bash
 uv run mckart verify
 uv run mckart print
 ```
 
-6. Open a PR
+4. Open a PR
 
 ## How to add a railway / road
 
@@ -95,6 +60,7 @@ You can follow the previous guide, but for step 3, use this template or look at
 from lib_marker import Track
 
 MARKERS = [
+    ...,
     Track(
         name="Nordbanen",
         icon = None,
@@ -105,6 +71,7 @@ MARKERS = [
             ...
         ],
     ),
+    ...,
 ]
 ```
 
@@ -112,8 +79,8 @@ MARKERS = [
 
 To add a new marker set, you need to:
 
-1. Create a new directory alongside the other marker sets in `src/marker_sets/<world>`.
-2. Create an `__init__.py` file in this directory with the following content:
+1. Create a new  file the other marker sets in `src/marker_sets/<world>`.
+2. Create a marker set in this file, using this template:
 
 ```python
 from lib_marker.marker_set import MarkerSet
diff --git a/src/marker_sets/nether/area_names.py b/src/marker_sets/nether/area_names.py
new file mode 100644
index 0000000..ad5cf7f
--- /dev/null
+++ b/src/marker_sets/nether/area_names.py
@@ -0,0 +1,14 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Area Names",
+    markers=[
+        Point(
+            name="Grisebukta",
+            icon=None,
+            x=-900,
+            y=64,
+            z=27,
+        ),
+    ],
+)
diff --git a/src/marker_sets/nether/area_names/__init__.py b/src/marker_sets/nether/area_names/__init__.py
deleted file mode 100644
index d1ae5f1..0000000
--- a/src/marker_sets/nether/area_names/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .grisebukta import MARKERS as grisebukta_markers
-
-MARKER_SET = MarkerSet(
-    name="Area Names",
-    markers=[
-        *grisebukta_markers,
-    ],
-)
diff --git a/src/marker_sets/nether/area_names/grisebukta.py b/src/marker_sets/nether/area_names/grisebukta.py
deleted file mode 100644
index a672719..0000000
--- a/src/marker_sets/nether/area_names/grisebukta.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Grisebukta",
-        icon=None,
-        x=-900,
-        y=64,
-        z=27,
-    ),
-]
diff --git a/src/marker_sets/nether/ice_tracks/__init__.py b/src/marker_sets/nether/ice_tracks.py
similarity index 60%
rename from src/marker_sets/nether/ice_tracks/__init__.py
rename to src/marker_sets/nether/ice_tracks.py
index 5699220..86a2446 100644
--- a/src/marker_sets/nether/ice_tracks/__init__.py
+++ b/src/marker_sets/nether/ice_tracks.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/the_end/other/__init__.py b/src/marker_sets/nether/other.py
similarity index 58%
rename from src/marker_sets/the_end/other/__init__.py
rename to src/marker_sets/nether/other.py
index a1e1630..6d160b7 100644
--- a/src/marker_sets/the_end/other/__init__.py
+++ b/src/marker_sets/nether/other.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/nether/portals/__init__.py b/src/marker_sets/nether/portals.py
similarity index 59%
rename from src/marker_sets/nether/portals/__init__.py
rename to src/marker_sets/nether/portals.py
index 3e036bc..07f8e47 100644
--- a/src/marker_sets/nether/portals/__init__.py
+++ b/src/marker_sets/nether/portals.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/nether/railways/__init__.py b/src/marker_sets/nether/railways.py
similarity index 59%
rename from src/marker_sets/nether/railways/__init__.py
rename to src/marker_sets/nether/railways.py
index a93292a..5cbe19e 100644
--- a/src/marker_sets/nether/railways/__init__.py
+++ b/src/marker_sets/nether/railways.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/overworld/area_names.py b/src/marker_sets/overworld/area_names.py
new file mode 100644
index 0000000..0b65aad
--- /dev/null
+++ b/src/marker_sets/overworld/area_names.py
@@ -0,0 +1,42 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Area Names",
+    markers=[
+        Point(
+            name="Andøya",
+            icon=None,
+            x=2300,
+            y=64,
+            z=250,
+        ),
+        Point(
+            name="England",
+            icon=None,
+            x=-1189,
+            y=64,
+            z=1556,
+        ),
+        Point(
+            name="Hemmelig mesabiom",
+            icon=None,
+            x=-980,
+            y=64,
+            z=4090,
+        ),
+        Point(
+            name="Summefjord",
+            icon=None,
+            x=-220,
+            y=64,
+            z=2890,
+        ),
+        Point(
+            name="Vestisødet",
+            icon=None,
+            x=-800,
+            y=64,
+            z=0,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/area_names/__init__.py b/src/marker_sets/overworld/area_names/__init__.py
deleted file mode 100644
index 5a06f2c..0000000
--- a/src/marker_sets/overworld/area_names/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .andoya import MARKERS as andoya_markers
-from .england import MARKERS as england_markers
-from .hemmelig_mesabiom import MARKERS as hemmelig_mesabiom_markers
-from .summefjord import MARKERS as summefjord_markers
-from .vestisodet import MARKERS as vestisodet_markers
-
-MARKER_SET = MarkerSet(
-    name="Area Names",
-    markers=[
-        *andoya_markers,
-        *england_markers,
-        *hemmelig_mesabiom_markers,
-        *summefjord_markers,
-        *vestisodet_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/area_names/andoya.py b/src/marker_sets/overworld/area_names/andoya.py
deleted file mode 100644
index 915b6a7..0000000
--- a/src/marker_sets/overworld/area_names/andoya.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Andøya",
-        icon=None,
-        x=2300,
-        y=64,
-        z=250,
-    ),
-]
diff --git a/src/marker_sets/overworld/area_names/england.py b/src/marker_sets/overworld/area_names/england.py
deleted file mode 100644
index 976b6b9..0000000
--- a/src/marker_sets/overworld/area_names/england.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="England",
-        icon=None,
-        x=-1189,
-        y=64,
-        z=1556,
-    ),
-]
diff --git a/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py b/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py
deleted file mode 100644
index dec48d3..0000000
--- a/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Hemmelig mesabiom",
-        icon=None,
-        x=-980,
-        y=64,
-        z=4090,
-    ),
-]
diff --git a/src/marker_sets/overworld/area_names/summefjord.py b/src/marker_sets/overworld/area_names/summefjord.py
deleted file mode 100644
index 3df83e3..0000000
--- a/src/marker_sets/overworld/area_names/summefjord.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Summefjord",
-        icon=None,
-        x=-220,
-        y=64,
-        z=2890,
-    ),
-]
diff --git a/src/marker_sets/overworld/area_names/vestisodet.py b/src/marker_sets/overworld/area_names/vestisodet.py
deleted file mode 100644
index a36511d..0000000
--- a/src/marker_sets/overworld/area_names/vestisodet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Vestisødet",
-        icon=None,
-        x=-800,
-        y=64,
-        z=0,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings.py b/src/marker_sets/overworld/buildings.py
new file mode 100644
index 0000000..4c141bb
--- /dev/null
+++ b/src/marker_sets/overworld/buildings.py
@@ -0,0 +1,70 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Buildings",
+    markers=[
+        Point(
+            name="Der Kölner Dom",
+            icon=None,
+            x=4630,
+            y=64,
+            z=270,
+        ),
+        Point(
+            name="Fyret",
+            icon=None,
+            x=3085,
+            y=64,
+            z=424,
+        ),
+        Point(
+            name="Hodeskallegrotten",
+            icon=None,
+            x=267,
+            y=89,
+            z=-496,
+        ),
+        Point(
+            name="Isjungelkatedralen",
+            icon=None,
+            x=-378,
+            y=64,
+            z=153,
+        ),
+        Point(
+            name="Jesus Christ Superstore",
+            icon=None,
+            x=280,
+            y=64,
+            z=-2800,
+        ),
+        Point(
+            name="Kystbasen",
+            icon=None,
+            x=-334,
+            y=116,
+            z=473,
+        ),
+        Point(
+            name="Tårnodden",
+            icon=None,
+            x=-22,
+            y=76,
+            z=67,
+        ),
+        Point(
+            name="Tegltårnet",
+            icon=None,
+            x=-99,
+            y=99,
+            z=1025,
+        ),
+        Point(
+            name="Vinterstranda hotel & resort",
+            icon=None,
+            x=3481,
+            y=75,
+            z=210,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/buildings/__init__.py b/src/marker_sets/overworld/buildings/__init__.py
deleted file mode 100644
index 42a3614..0000000
--- a/src/marker_sets/overworld/buildings/__init__.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .der_kolner_dom import MARKERS as der_kolner_dom_markers
-from .fyret import MARKERS as fyret_markers
-from .hodeskallegrotten import MARKERS as hodeskallegrotten_markers
-from .isjungelkatedralen import MARKERS as isjungelkatedralen_markers
-from .jesus_christ_superstore import MARKERS as jesus_christ_superstore_markers
-from .kystbasen import MARKERS as kystbasen_markers
-from .taarnodden import MARKERS as taarnodden_markers
-from .tegltaarnet import MARKERS as tegltaarnet_markers
-from .vinterstranda_hotel_og_resort import (
-    MARKERS as vinterstranda_hotel_og_resort_markers,
-)
-
-MARKER_SET = MarkerSet(
-    name="Buildings",
-    markers=[
-        *der_kolner_dom_markers,
-        *fyret_markers,
-        *hodeskallegrotten_markers,
-        *isjungelkatedralen_markers,
-        *jesus_christ_superstore_markers,
-        *kystbasen_markers,
-        *taarnodden_markers,
-        *tegltaarnet_markers,
-        *vinterstranda_hotel_og_resort_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/buildings/der_kolner_dom.py b/src/marker_sets/overworld/buildings/der_kolner_dom.py
deleted file mode 100644
index 97affcf..0000000
--- a/src/marker_sets/overworld/buildings/der_kolner_dom.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Der Kölner Dom",
-        icon=None,
-        x=4630,
-        y=64,
-        z=270,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/fyret.py b/src/marker_sets/overworld/buildings/fyret.py
deleted file mode 100644
index 4bd563b..0000000
--- a/src/marker_sets/overworld/buildings/fyret.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Fyret",
-        icon=None,
-        x=3085,
-        y=64,
-        z=424,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/hodeskallegrotten.py b/src/marker_sets/overworld/buildings/hodeskallegrotten.py
deleted file mode 100644
index 1575943..0000000
--- a/src/marker_sets/overworld/buildings/hodeskallegrotten.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Hodeskallegrotten",
-        icon=None,
-        x=267,
-        y=89,
-        z=-496,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/isjungelkatedralen.py b/src/marker_sets/overworld/buildings/isjungelkatedralen.py
deleted file mode 100644
index 2d7ffd4..0000000
--- a/src/marker_sets/overworld/buildings/isjungelkatedralen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Isjungelkatedralen",
-        icon=None,
-        x=-378,
-        y=64,
-        z=153,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/jesus_christ_superstore.py b/src/marker_sets/overworld/buildings/jesus_christ_superstore.py
deleted file mode 100644
index 4c99d8c..0000000
--- a/src/marker_sets/overworld/buildings/jesus_christ_superstore.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Jesus Christ Superstore",
-        icon=None,
-        x=280,
-        y=64,
-        z=-2800,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/kystbasen.py b/src/marker_sets/overworld/buildings/kystbasen.py
deleted file mode 100644
index e63f2fd..0000000
--- a/src/marker_sets/overworld/buildings/kystbasen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Kystbasen",
-        icon=None,
-        x=-334,
-        y=116,
-        z=473,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/taarnodden.py b/src/marker_sets/overworld/buildings/taarnodden.py
deleted file mode 100644
index 0e897ba..0000000
--- a/src/marker_sets/overworld/buildings/taarnodden.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Tårnodden",
-        icon=None,
-        x=-22,
-        y=76,
-        z=67,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/tegltaarnet.py b/src/marker_sets/overworld/buildings/tegltaarnet.py
deleted file mode 100644
index bae379c..0000000
--- a/src/marker_sets/overworld/buildings/tegltaarnet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Tegltårnet",
-        icon=None,
-        x=-99,
-        y=99,
-        z=1025,
-    ),
-]
diff --git a/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py b/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py
deleted file mode 100644
index a4dd1d4..0000000
--- a/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Vinterstranda hotel & resort",
-        icon=None,
-        x=3481,
-        y=75,
-        z=210,
-    ),
-]
diff --git a/src/marker_sets/overworld/cities.py b/src/marker_sets/overworld/cities.py
new file mode 100644
index 0000000..9e0f698
--- /dev/null
+++ b/src/marker_sets/overworld/cities.py
@@ -0,0 +1,42 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Cities",
+    markers=[
+        Point(
+            name="Heimfjell",
+            icon=None,
+            x=177,
+            y=64,
+            z=177,
+        ),
+        Point(
+            name="Holmgard",
+            icon=None,
+            x=4468,
+            y=64,
+            z=1337,
+        ),
+        Point(
+            name="Tangen",
+            icon=None,
+            x=58,
+            y=63,
+            z=-2860,
+        ),
+        Point(
+            name="Tosjødalen",
+            icon=None,
+            x=960,
+            y=64,
+            z=460,
+        ),
+        Point(
+            name="Vikingelandsbyen",
+            icon=None,
+            x=360,
+            y=64,
+            z=-460,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/cities/__init__.py b/src/marker_sets/overworld/cities/__init__.py
deleted file mode 100644
index 46c4824..0000000
--- a/src/marker_sets/overworld/cities/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .heimfjell import MARKERS as heimfjell_markers
-from .holmgard import MARKERS as holmgard_markers
-from .tangen import MARKERS as tangen_markers
-from .tosjodalen import MARKERS as tosjodalen_markers
-from .vikingelandsbyen import MARKERS as vikingelandsbyen_markers
-
-MARKER_SET = MarkerSet(
-    name="Cities",
-    markers=[
-        *heimfjell_markers,
-        *holmgard_markers,
-        *tangen_markers,
-        *tosjodalen_markers,
-        *vikingelandsbyen_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/cities/heimfjell.py b/src/marker_sets/overworld/cities/heimfjell.py
deleted file mode 100644
index 27f8e34..0000000
--- a/src/marker_sets/overworld/cities/heimfjell.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Heimfjell",
-        icon=None,
-        x=177,
-        y=64,
-        z=177,
-    ),
-]
diff --git a/src/marker_sets/overworld/cities/holmgard.py b/src/marker_sets/overworld/cities/holmgard.py
deleted file mode 100644
index 9b831b4..0000000
--- a/src/marker_sets/overworld/cities/holmgard.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Holmgard",
-        icon=None,
-        x=4468,
-        y=64,
-        z=1337,
-    ),
-]
diff --git a/src/marker_sets/overworld/cities/tangen.py b/src/marker_sets/overworld/cities/tangen.py
deleted file mode 100644
index 4a7ff59..0000000
--- a/src/marker_sets/overworld/cities/tangen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Tangen",
-        icon=None,
-        x=58,
-        y=63,
-        z=-2860,
-    ),
-]
diff --git a/src/marker_sets/overworld/cities/tosjodalen.py b/src/marker_sets/overworld/cities/tosjodalen.py
deleted file mode 100644
index b55c397..0000000
--- a/src/marker_sets/overworld/cities/tosjodalen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Tosjødalen",
-        icon=None,
-        x=960,
-        y=64,
-        z=460,
-    ),
-]
diff --git a/src/marker_sets/overworld/cities/vikingelandsbyen.py b/src/marker_sets/overworld/cities/vikingelandsbyen.py
deleted file mode 100644
index 244fd70..0000000
--- a/src/marker_sets/overworld/cities/vikingelandsbyen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Vikingelandsbyen",
-        icon=None,
-        x=360,
-        y=64,
-        z=-460,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes.py b/src/marker_sets/overworld/homes.py
new file mode 100644
index 0000000..0121b4f
--- /dev/null
+++ b/src/marker_sets/overworld/homes.py
@@ -0,0 +1,84 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Homes",
+    markers=[
+        Point(
+            name="Akasienborg",
+            icon=None,
+            x=-128,
+            y=64,
+            z=1460,
+        ),
+        Point(
+            name="Bikkjeby",
+            icon=None,
+            x=2950,
+            y=64,
+            z=270,
+        ),
+        Point(
+            name="Biosfæren",
+            icon=None,
+            x=834,
+            y=65,
+            z=-3089,
+        ),
+        Point(
+            name="Bjørkeholmen",
+            icon=None,
+            x=102,
+            y=77,
+            z=37,
+        ),
+        Point(
+            name="Bjørnebukten",
+            icon=None,
+            x=473,
+            y=78,
+            z=-3043,
+        ),
+        Point(
+            name="Huløyeid",
+            icon=None,
+            x=-54,
+            y=64,
+            z=234,
+        ),
+        Point(
+            name="Singapore",
+            icon=None,
+            x=-600,
+            y=64,
+            z=1130,
+        ),
+        Point(
+            name="Summevatn",
+            icon=None,
+            x=-110,
+            y=64,
+            z=3465,
+        ),
+        Point(
+            name="SuperTheodors fiskehus",
+            icon=None,
+            x=1570,
+            y=64,
+            z=3285,
+        ),
+        Point(
+            name="Svartskoghavn",
+            icon=None,
+            x=-370,
+            y=64,
+            z=2390,
+        ),
+        Point(
+            name="Vestlandet",
+            icon=None,
+            x=-2204,
+            y=64,
+            z=447,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/homes/__init__.py b/src/marker_sets/overworld/homes/__init__.py
deleted file mode 100644
index a0234a1..0000000
--- a/src/marker_sets/overworld/homes/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .biosfaeren import MARKERS as biosfaeren_markers
-from .akasienborg import MARKERS as akasienborg_markers
-from .bikkjeby import MARKERS as bikkjeby_markers
-from .bjorkeholmen import MARKERS as bjorkeholmen_markers
-from .bjornebukten import MARKERS as bjornebukten_markers
-from .huloyeid import MARKERS as huloyeid_markers
-from .singapore import MARKERS as singapore_markers
-from .summevatn import MARKERS as summevatn_markers
-from .supertheodors_fiskehus import MARKERS as supertheodors_fiskehus_markers
-from .svartskoghavn import MARKERS as svartskoghavn_markers
-from .vestlandet import MARKERS as vestlandet_markers
-
-MARKER_SET = MarkerSet(
-    name="Homes",
-    markers=[
-        *akasienborg_markers,
-        *bikkjeby_markers,
-        *biosfaeren_markers,
-        *bjorkeholmen_markers,
-        *bjornebukten_markers,
-        *huloyeid_markers,
-        *singapore_markers,
-        *summevatn_markers,
-        *supertheodors_fiskehus_markers,
-        *svartskoghavn_markers,
-        *vestlandet_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/homes/akasienborg.py b/src/marker_sets/overworld/homes/akasienborg.py
deleted file mode 100644
index 800611f..0000000
--- a/src/marker_sets/overworld/homes/akasienborg.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Akasienborg",
-        icon=None,
-        x=-128,
-        y=64,
-        z=1460,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/bikkjeby.py b/src/marker_sets/overworld/homes/bikkjeby.py
deleted file mode 100644
index 1f0e56c..0000000
--- a/src/marker_sets/overworld/homes/bikkjeby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Bikkjeby",
-        icon=None,
-        x=2950,
-        y=64,
-        z=270,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/biosfaeren.py b/src/marker_sets/overworld/homes/biosfaeren.py
deleted file mode 100644
index 40a7299..0000000
--- a/src/marker_sets/overworld/homes/biosfaeren.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Biosfæren",
-        icon=None,
-        x=834,
-        y=65,
-        z=-3089,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/bjorkeholmen.py b/src/marker_sets/overworld/homes/bjorkeholmen.py
deleted file mode 100644
index ee0b970..0000000
--- a/src/marker_sets/overworld/homes/bjorkeholmen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Bjørkeholmen",
-        icon=None,
-        x=102,
-        y=77,
-        z=37,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/bjornebukten.py b/src/marker_sets/overworld/homes/bjornebukten.py
deleted file mode 100644
index eeb0d92..0000000
--- a/src/marker_sets/overworld/homes/bjornebukten.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Bjørnebukten",
-        icon=None,
-        x=473,
-        y=78,
-        z=-3043,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/huloyeid.py b/src/marker_sets/overworld/homes/huloyeid.py
deleted file mode 100644
index c92a6b5..0000000
--- a/src/marker_sets/overworld/homes/huloyeid.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Huløyeid",
-        icon=None,
-        x=-54,
-        y=64,
-        z=234,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/singapore.py b/src/marker_sets/overworld/homes/singapore.py
deleted file mode 100644
index 7f784c0..0000000
--- a/src/marker_sets/overworld/homes/singapore.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Singapore",
-        icon=None,
-        x=-600,
-        y=64,
-        z=1130,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/summevatn.py b/src/marker_sets/overworld/homes/summevatn.py
deleted file mode 100644
index 381f0db..0000000
--- a/src/marker_sets/overworld/homes/summevatn.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Summevatn",
-        icon=None,
-        x=-110,
-        y=64,
-        z=3465,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/supertheodors_fiskehus.py b/src/marker_sets/overworld/homes/supertheodors_fiskehus.py
deleted file mode 100644
index ccc6434..0000000
--- a/src/marker_sets/overworld/homes/supertheodors_fiskehus.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="SuperTheodors fiskehus",
-        icon=None,
-        x=1570,
-        y=64,
-        z=3285,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/svartskoghavn.py b/src/marker_sets/overworld/homes/svartskoghavn.py
deleted file mode 100644
index d198dec..0000000
--- a/src/marker_sets/overworld/homes/svartskoghavn.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Svartskoghavn",
-        icon=None,
-        x=-370,
-        y=64,
-        z=2390,
-    ),
-]
diff --git a/src/marker_sets/overworld/homes/vestlandet.py b/src/marker_sets/overworld/homes/vestlandet.py
deleted file mode 100644
index 25d9520..0000000
--- a/src/marker_sets/overworld/homes/vestlandet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Vestlandet",
-        icon=None,
-        x=-2204,
-        y=64,
-        z=447,
-    ),
-]
diff --git a/src/marker_sets/overworld/huts.py b/src/marker_sets/overworld/huts.py
new file mode 100644
index 0000000..f051f20
--- /dev/null
+++ b/src/marker_sets/overworld/huts.py
@@ -0,0 +1,28 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Huts",
+    markers=[
+        Point(
+            name="Dypskiferhytta",
+            icon=None,
+            x=-1563,
+            y=64,
+            z=-1966,
+        ),
+        Point(
+            name="Grensebuelvbu",
+            icon=None,
+            x=550,
+            y=64,
+            z=-1480,
+        ),
+        Point(
+            name="Nyverdenhytta",
+            icon=None,
+            x=848,
+            y=70,
+            z=1583,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/huts/__init__.py b/src/marker_sets/overworld/huts/__init__.py
deleted file mode 100644
index a7030ff..0000000
--- a/src/marker_sets/overworld/huts/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .dypskiferhytta import MARKERS as dypskiferhytta_markers
-from .grensebuelvbu import MARKERS as grensebuelvbu_markers
-from .nyverdenhytta import MARKERS as nyverdenhytta_markers
-
-MARKER_SET = MarkerSet(
-    name="Huts",
-    markers=[
-        *dypskiferhytta_markers,
-        *grensebuelvbu_markers,
-        *nyverdenhytta_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/huts/dypskiferhytta.py b/src/marker_sets/overworld/huts/dypskiferhytta.py
deleted file mode 100644
index d9c31c5..0000000
--- a/src/marker_sets/overworld/huts/dypskiferhytta.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Dypskiferhytta",
-        icon=None,
-        x=-1563,
-        y=64,
-        z=-1966,
-    ),
-]
diff --git a/src/marker_sets/overworld/huts/grensebuelvbu.py b/src/marker_sets/overworld/huts/grensebuelvbu.py
deleted file mode 100644
index bc1a2f3..0000000
--- a/src/marker_sets/overworld/huts/grensebuelvbu.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Grensebuelvbu",
-        icon=None,
-        x=550,
-        y=64,
-        z=-1480,
-    ),
-]
diff --git a/src/marker_sets/overworld/huts/nyverdenhytta.py b/src/marker_sets/overworld/huts/nyverdenhytta.py
deleted file mode 100644
index 46bd005..0000000
--- a/src/marker_sets/overworld/huts/nyverdenhytta.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Nyverdenhytta",
-        icon=None,
-        x=848,
-        y=70,
-        z=1583,
-    ),
-]
diff --git a/src/marker_sets/overworld/infrastructure.py b/src/marker_sets/overworld/infrastructure.py
new file mode 100644
index 0000000..dae0b59
--- /dev/null
+++ b/src/marker_sets/overworld/infrastructure.py
@@ -0,0 +1,21 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Infrastructure",
+    markers=[
+        Point(
+            name="Grantrebukta",
+            icon=None,
+            x=2350,
+            y=64,
+            z=-136,
+        ),
+        Point(
+            name="Smalelvbro",
+            icon=None,
+            x=77,
+            y=69,
+            z=-348,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/infrastructure/__init__.py b/src/marker_sets/overworld/infrastructure/__init__.py
deleted file mode 100644
index 3fbe05e..0000000
--- a/src/marker_sets/overworld/infrastructure/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .grantrebukta import MARKERS as grantrebukta_markers
-from .smalelvbro import MARKERS as smalelvbro_markers
-
-MARKER_SET = MarkerSet(
-    name="Infrastructure",
-    markers=[
-        *grantrebukta_markers,
-        *smalelvbro_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/infrastructure/grantrebukta.py b/src/marker_sets/overworld/infrastructure/grantrebukta.py
deleted file mode 100644
index 7a45b96..0000000
--- a/src/marker_sets/overworld/infrastructure/grantrebukta.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Grantrebukta",
-        icon=None,
-        x=2350,
-        y=64,
-        z=-136,
-    ),
-]
diff --git a/src/marker_sets/overworld/infrastructure/smalelvbro.py b/src/marker_sets/overworld/infrastructure/smalelvbro.py
deleted file mode 100644
index c7cd317..0000000
--- a/src/marker_sets/overworld/infrastructure/smalelvbro.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Smalelvbro",
-        icon=None,
-        x=77,
-        y=69,
-        z=-348,
-    ),
-]
diff --git a/src/marker_sets/overworld/mines.py b/src/marker_sets/overworld/mines.py
new file mode 100644
index 0000000..902aeef
--- /dev/null
+++ b/src/marker_sets/overworld/mines.py
@@ -0,0 +1,21 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Mines",
+    markers=[
+        Point(
+            name="Sandsteingruva",
+            icon=None,
+            x=56,
+            y=67,
+            z=-266,
+        ),
+        Point(
+            name="Slimegruva",
+            icon=None,
+            x=-206,
+            y=64,
+            z=-35,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/mines/__init__.py b/src/marker_sets/overworld/mines/__init__.py
deleted file mode 100644
index 8e40630..0000000
--- a/src/marker_sets/overworld/mines/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .sandsteingruva import MARKERS as sandsteingruva_markers
-from .slimegruva import MARKERS as slimegruva_markers
-
-MARKER_SET = MarkerSet(
-    name="Mines",
-    markers=[
-        *sandsteingruva_markers,
-        *slimegruva_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/mines/sandsteingruva.py b/src/marker_sets/overworld/mines/sandsteingruva.py
deleted file mode 100644
index 3714841..0000000
--- a/src/marker_sets/overworld/mines/sandsteingruva.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Sandsteingruva",
-        icon=None,
-        x=56,
-        y=67,
-        z=-266,
-    ),
-]
diff --git a/src/marker_sets/overworld/mines/slimegruva.py b/src/marker_sets/overworld/mines/slimegruva.py
deleted file mode 100644
index 45e780b..0000000
--- a/src/marker_sets/overworld/mines/slimegruva.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Slimegruva",
-        icon=None,
-        x=-206,
-        y=64,
-        z=-35,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature.py b/src/marker_sets/overworld/nature.py
new file mode 100644
index 0000000..8faf7f5
--- /dev/null
+++ b/src/marker_sets/overworld/nature.py
@@ -0,0 +1,140 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Nature",
+    markers=[
+        Point(
+            name="Blindodden",
+            icon=None,
+            x=874,
+            y=65,
+            z=160,
+        ),
+        Point(
+            name="Hulevatna",
+            icon=None,
+            x=240,
+            y=64,
+            z=3070,
+        ),
+        Point(
+            name="Kirkemyr",
+            icon=None,
+            x=6880,
+            y=64,
+            z=-465,
+        ),
+        Point(
+            name="Lamafjellet",
+            icon=None,
+            x=1810,
+            y=64,
+            z=-1630,
+        ),
+        Point(
+            name="Langstrand",
+            icon=None,
+            x=-305,
+            y=64,
+            z=535,
+        ),
+        Point(
+            name="Lille isbjørnelv",
+            icon=None,
+            x=730,
+            y=64,
+            z=-1900,
+        ),
+        Point(
+            name="Naturreservat",
+            icon=None,
+            x=4,
+            y=64,
+            z=800,
+        ),
+        Point(
+            name="Piratbukta",
+            icon=None,
+            x=150,
+            y=64,
+            z=80,
+        ),
+        Point(
+            name="Snøklippan",
+            icon=None,
+            x=-1654,
+            y=64,
+            z=-654,
+        ),
+        Point(
+            name="Store isbjørnelv",
+            icon=None,
+            x=850,
+            y=64,
+            z=-2130,
+        ),
+        Point(
+            name="Storhavet i øst",
+            icon=None,
+            x=3000,
+            y=64,
+            z=1000,
+        ),
+        Point(
+            name="Storhavskanalen",
+            icon=None,
+            x=1005,
+            y=64,
+            z=1335,
+        ),
+        Point(
+            name="Storsnøfjella",
+            icon=None,
+            x=5470,
+            y=64,
+            z=-270,
+        ),
+        Point(
+            name="Storvatnet",
+            icon=None,
+            x=675,
+            y=64,
+            z=362,
+        ),
+        Point(
+            name="SuperTheodors strand",
+            icon=None,
+            x=2111,
+            y=64,
+            z=3777,
+        ),
+        Point(
+            name="Trangdalen",
+            icon=None,
+            x=-47,
+            y=64,
+            z=146,
+        ),
+        Point(
+            name="Turrikkelmyra",
+            icon=None,
+            x=-160,
+            y=64,
+            z=1480,
+        ),
+        Point(
+            name="Ulveelva",
+            icon=None,
+            x=910,
+            y=64,
+            z=3050,
+        ),
+        Point(
+            name="Vestsumpland",
+            icon=None,
+            x=-1818,
+            y=64,
+            z=98,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/nature/__init__.py b/src/marker_sets/overworld/nature/__init__.py
deleted file mode 100644
index 85ea7cb..0000000
--- a/src/marker_sets/overworld/nature/__init__.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .blindodden import MARKERS as blindodden_markers
-from .hulevatna import MARKERS as hulevatna_markers
-from .kirkemyr import MARKERS as kirkemyr_markers
-from .lamafjellet import MARKERS as lamafjellet_markers
-from .langstrand import MARKERS as langstrand_markers
-from .lille_isbjornelv import MARKERS as lille_isbjornelv_markers
-from .naturreservat import MARKERS as naturreservat_markers
-from .piratbukta import MARKERS as piratbukta_markers
-from .snoklippan import MARKERS as snoklippan_markers
-from .store_isbjornelv import MARKERS as store_isbjornelv_markers
-from .storhavet_i_ost import MARKERS as storhavet_i_ost_markers
-from .storhavs_kanalen import MARKERS as storhavs_kanalen_markers
-from .storsnofjella import MARKERS as storsnofjella_markers
-from .storvatnet import MARKERS as storvatnet_markers
-from .supertheodors_strand import MARKERS as supertheodors_strand_markers
-from .trangdalen import MARKERS as trangdalen_markers
-from .turrikkelmyra import MARKERS as turrikkelmyra_markers
-from .ulveelva import MARKERS as ulveelva_markers
-from .vestsumpland import MARKERS as vestsumpland_markers
-
-
-MARKER_SET = MarkerSet(
-    name="Nature",
-    markers=[
-        *blindodden_markers,
-        *hulevatna_markers,
-        *kirkemyr_markers,
-        *lamafjellet_markers,
-        *langstrand_markers,
-        *lille_isbjornelv_markers,
-        *naturreservat_markers,
-        *piratbukta_markers,
-        *snoklippan_markers,
-        *store_isbjornelv_markers,
-        *storhavet_i_ost_markers,
-        *storhavs_kanalen_markers,
-        *storsnofjella_markers,
-        *storvatnet_markers,
-        *supertheodors_strand_markers,
-        *trangdalen_markers,
-        *turrikkelmyra_markers,
-        *ulveelva_markers,
-        *vestsumpland_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/nature/blindodden.py b/src/marker_sets/overworld/nature/blindodden.py
deleted file mode 100644
index fb1bd9a..0000000
--- a/src/marker_sets/overworld/nature/blindodden.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Blindodden",
-        icon=None,
-        x=874,
-        y=65,
-        z=160,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/hulevatna.py b/src/marker_sets/overworld/nature/hulevatna.py
deleted file mode 100644
index 2619f8c..0000000
--- a/src/marker_sets/overworld/nature/hulevatna.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Hulevatna",
-        icon=None,
-        x=240,
-        y=64,
-        z=3070,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/kirkemyr.py b/src/marker_sets/overworld/nature/kirkemyr.py
deleted file mode 100644
index 88c2d5e..0000000
--- a/src/marker_sets/overworld/nature/kirkemyr.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Kirkemyr",
-        icon=None,
-        x=6880,
-        y=64,
-        z=-465,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/lamafjellet.py b/src/marker_sets/overworld/nature/lamafjellet.py
deleted file mode 100644
index 1ab6755..0000000
--- a/src/marker_sets/overworld/nature/lamafjellet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Lamafjellet",
-        icon=None,
-        x=1810,
-        y=64,
-        z=-1630,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/langstrand.py b/src/marker_sets/overworld/nature/langstrand.py
deleted file mode 100644
index b501261..0000000
--- a/src/marker_sets/overworld/nature/langstrand.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Langstrand",
-        icon=None,
-        x=-305,
-        y=64,
-        z=535,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/lille_isbjornelv.py b/src/marker_sets/overworld/nature/lille_isbjornelv.py
deleted file mode 100644
index 545f881..0000000
--- a/src/marker_sets/overworld/nature/lille_isbjornelv.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Lille isbjørnelv",
-        icon=None,
-        x=730,
-        y=64,
-        z=-1900,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/naturreservat.py b/src/marker_sets/overworld/nature/naturreservat.py
deleted file mode 100644
index 164157d..0000000
--- a/src/marker_sets/overworld/nature/naturreservat.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Naturreservat",
-        icon=None,
-        x=4,
-        y=64,
-        z=800,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/piratbukta.py b/src/marker_sets/overworld/nature/piratbukta.py
deleted file mode 100644
index b3a9d7f..0000000
--- a/src/marker_sets/overworld/nature/piratbukta.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Piratbukta",
-        icon=None,
-        x=150,
-        y=64,
-        z=80,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/snoklippan.py b/src/marker_sets/overworld/nature/snoklippan.py
deleted file mode 100644
index c63b469..0000000
--- a/src/marker_sets/overworld/nature/snoklippan.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Snøklippan",
-        icon=None,
-        x=-1654,
-        y=64,
-        z=-654,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/store_isbjornelv.py b/src/marker_sets/overworld/nature/store_isbjornelv.py
deleted file mode 100644
index 60a59fe..0000000
--- a/src/marker_sets/overworld/nature/store_isbjornelv.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Store isbjørnelv",
-        icon=None,
-        x=850,
-        y=64,
-        z=-2130,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/storhavet_i_ost.py b/src/marker_sets/overworld/nature/storhavet_i_ost.py
deleted file mode 100644
index 1657368..0000000
--- a/src/marker_sets/overworld/nature/storhavet_i_ost.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Storhavet i øst",
-        icon=None,
-        x=3000,
-        y=64,
-        z=1000,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/storhavs_kanalen.py b/src/marker_sets/overworld/nature/storhavs_kanalen.py
deleted file mode 100644
index 0297786..0000000
--- a/src/marker_sets/overworld/nature/storhavs_kanalen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Storhavskanalen",
-        icon=None,
-        x=1005,
-        y=64,
-        z=1335,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/storsnofjella.py b/src/marker_sets/overworld/nature/storsnofjella.py
deleted file mode 100644
index 9c3c561..0000000
--- a/src/marker_sets/overworld/nature/storsnofjella.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Storsnøfjella",
-        icon=None,
-        x=5470,
-        y=64,
-        z=-270,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/storvatnet.py b/src/marker_sets/overworld/nature/storvatnet.py
deleted file mode 100644
index c64715e..0000000
--- a/src/marker_sets/overworld/nature/storvatnet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Storvatnet",
-        icon=None,
-        x=675,
-        y=64,
-        z=362,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/supertheodors_strand.py b/src/marker_sets/overworld/nature/supertheodors_strand.py
deleted file mode 100644
index 7610115..0000000
--- a/src/marker_sets/overworld/nature/supertheodors_strand.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="SuperTheodors strand",
-        icon=None,
-        x=2111,
-        y=64,
-        z=3777,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/trangdalen.py b/src/marker_sets/overworld/nature/trangdalen.py
deleted file mode 100644
index 46da77c..0000000
--- a/src/marker_sets/overworld/nature/trangdalen.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Trangdalen",
-        icon=None,
-        x=-47,
-        y=64,
-        z=146,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/turrikkelmyra.py b/src/marker_sets/overworld/nature/turrikkelmyra.py
deleted file mode 100644
index b07beae..0000000
--- a/src/marker_sets/overworld/nature/turrikkelmyra.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Turrikkelmyra",
-        icon=None,
-        x=-160,
-        y=64,
-        z=1480,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/ulveelva.py b/src/marker_sets/overworld/nature/ulveelva.py
deleted file mode 100644
index 6e6e887..0000000
--- a/src/marker_sets/overworld/nature/ulveelva.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Ulveelva",
-        icon=None,
-        x=910,
-        y=64,
-        z=3050,
-    ),
-]
diff --git a/src/marker_sets/overworld/nature/vestsumpland.py b/src/marker_sets/overworld/nature/vestsumpland.py
deleted file mode 100644
index fba8d01..0000000
--- a/src/marker_sets/overworld/nature/vestsumpland.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Vestsumpland",
-        icon=None,
-        x=-1818,
-        y=64,
-        z=98,
-    ),
-]
diff --git a/src/marker_sets/overworld/other.py b/src/marker_sets/overworld/other.py
new file mode 100644
index 0000000..0b1f64b
--- /dev/null
+++ b/src/marker_sets/overworld/other.py
@@ -0,0 +1,21 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Other",
+    markers=[
+        Point(
+            name="Leirhavn",
+            icon=None,
+            x=512,
+            y=64,
+            z=-3320,
+        ),
+        Point(
+            name="Nullpunkt",
+            icon=None,
+            x=0,
+            y=64,
+            z=0,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/other/__init__.py b/src/marker_sets/overworld/other/__init__.py
deleted file mode 100644
index 3cf8867..0000000
--- a/src/marker_sets/overworld/other/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .leirhavn import MARKERS as leirhavn_markers
-from .nullpunkt import MARKERS as nullpunkt_markers
-
-MARKER_SET = MarkerSet(
-    name="Other",
-    markers=[
-        *leirhavn_markers,
-        *nullpunkt_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/other/leirhavn.py b/src/marker_sets/overworld/other/leirhavn.py
deleted file mode 100644
index 3cc4c84..0000000
--- a/src/marker_sets/overworld/other/leirhavn.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Leirhavn",
-        icon=None,
-        x=512,
-        y=64,
-        z=-3320,
-    ),
-]
diff --git a/src/marker_sets/overworld/other/nullpunkt.py b/src/marker_sets/overworld/other/nullpunkt.py
deleted file mode 100644
index 6fcb6c6..0000000
--- a/src/marker_sets/overworld/other/nullpunkt.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Nullpunkt",
-        icon=None,
-        x=0,
-        y=64,
-        z=0,
-    ),
-]
diff --git a/src/marker_sets/overworld/railways/__init__.py b/src/marker_sets/overworld/railways.py
similarity index 59%
rename from src/marker_sets/overworld/railways/__init__.py
rename to src/marker_sets/overworld/railways.py
index a93292a..5cbe19e 100644
--- a/src/marker_sets/overworld/railways/__init__.py
+++ b/src/marker_sets/overworld/railways.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/overworld/roads/__init__.py b/src/marker_sets/overworld/roads.py
similarity index 58%
rename from src/marker_sets/overworld/roads/__init__.py
rename to src/marker_sets/overworld/roads.py
index 322d231..3db4f78 100644
--- a/src/marker_sets/overworld/roads/__init__.py
+++ b/src/marker_sets/overworld/roads.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/overworld/villages.py b/src/marker_sets/overworld/villages.py
new file mode 100644
index 0000000..6a91b9f
--- /dev/null
+++ b/src/marker_sets/overworld/villages.py
@@ -0,0 +1,70 @@
+from lib_marker import MarkerSet, Point
+
+MARKER_SET = MarkerSet(
+    name="Villages",
+    markers=[
+        Point(
+            name="Bondeby",
+            icon=None,
+            x=6200,
+            y=64,
+            z=-300,
+        ),
+        Point(
+            name="Gammelleirnes",
+            icon=None,
+            x=800,
+            y=64,
+            z=-3300,
+        ),
+        Point(
+            name="Hestelandsby",
+            icon=None,
+            x=2734,
+            y=64,
+            z=-984,
+        ),
+        Point(
+            name="Isbjørnby",
+            icon=None,
+            x=723,
+            y=64,
+            z=-2380,
+        ),
+        Point(
+            name="Ittoqqortoormiit",
+            icon=None,
+            x=100,
+            y=64,
+            z=-3830,
+        ),
+        Point(
+            name="Kløfteby",
+            icon=None,
+            x=695,
+            y=64,
+            z=2812,
+        ),
+        Point(
+            name="NPC-landsby nord",
+            icon=None,
+            x=337,
+            y=64,
+            z=-853,
+        ),
+        Point(
+            name="NPC-landsby",
+            icon=None,
+            x=1278,
+            y=64,
+            z=-397,
+        ),
+        Point(
+            name="Smedby",
+            icon=None,
+            x=-1760,
+            y=64,
+            z=-2440,
+        ),
+    ],
+)
diff --git a/src/marker_sets/overworld/villages/__init__.py b/src/marker_sets/overworld/villages/__init__.py
deleted file mode 100644
index ffb9334..0000000
--- a/src/marker_sets/overworld/villages/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from lib_marker.marker_set import MarkerSet
-
-from .bondeby import MARKERS as bondeby_markers
-from .gammelleirnes import MARKERS as gammelleirnes_markers
-from .hestelandsby import MARKERS as hestelandsby_markers
-from .isbjornby import MARKERS as isbjornby_markers
-from .ittoqqortoormiit import MARKERS as ittoqqortoormiit_markers
-from .klofteby import MARKERS as kloftebye_markers
-from .npc_landsby import MARKERS as npc_landsby_markers
-from .npc_landsby_nord import MARKERS as npc_landsby_nord_markers
-from .smedby import MARKERS as smedby_markers
-
-
-MARKER_SET = MarkerSet(
-    name="Villages",
-    markers=[
-        *bondeby_markers,
-        *gammelleirnes_markers,
-        *hestelandsby_markers,
-        *isbjornby_markers,
-        *ittoqqortoormiit_markers,
-        *kloftebye_markers,
-        *npc_landsby_markers,
-        *npc_landsby_nord_markers,
-        *smedby_markers,
-    ],
-)
diff --git a/src/marker_sets/overworld/villages/bondeby.py b/src/marker_sets/overworld/villages/bondeby.py
deleted file mode 100644
index 65348d7..0000000
--- a/src/marker_sets/overworld/villages/bondeby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Bondeby",
-        icon=None,
-        x=6200,
-        y=64,
-        z=-300,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/gammelleirnes.py b/src/marker_sets/overworld/villages/gammelleirnes.py
deleted file mode 100644
index 72681b1..0000000
--- a/src/marker_sets/overworld/villages/gammelleirnes.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Gammelleirnes",
-        icon=None,
-        x=800,
-        y=64,
-        z=-3300,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/hestelandsby.py b/src/marker_sets/overworld/villages/hestelandsby.py
deleted file mode 100644
index e289d77..0000000
--- a/src/marker_sets/overworld/villages/hestelandsby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Hestelandsby",
-        icon=None,
-        x=2734,
-        y=64,
-        z=-984,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/isbjornby.py b/src/marker_sets/overworld/villages/isbjornby.py
deleted file mode 100644
index 1d363a4..0000000
--- a/src/marker_sets/overworld/villages/isbjornby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Isbjørnby",
-        icon=None,
-        x=723,
-        y=64,
-        z=-2380,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/ittoqqortoormiit.py b/src/marker_sets/overworld/villages/ittoqqortoormiit.py
deleted file mode 100644
index 27f1891..0000000
--- a/src/marker_sets/overworld/villages/ittoqqortoormiit.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Ittoqqortoormiit",
-        icon=None,
-        x=100,
-        y=64,
-        z=-3830,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/klofteby.py b/src/marker_sets/overworld/villages/klofteby.py
deleted file mode 100644
index 531616b..0000000
--- a/src/marker_sets/overworld/villages/klofteby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Kløfteby",
-        icon=None,
-        x=695,
-        y=64,
-        z=2812,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/npc_landsby.py b/src/marker_sets/overworld/villages/npc_landsby.py
deleted file mode 100644
index a041c75..0000000
--- a/src/marker_sets/overworld/villages/npc_landsby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="NPC-landsby",
-        icon=None,
-        x=1278,
-        y=64,
-        z=-397,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/npc_landsby_nord.py b/src/marker_sets/overworld/villages/npc_landsby_nord.py
deleted file mode 100644
index c04507d..0000000
--- a/src/marker_sets/overworld/villages/npc_landsby_nord.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="NPC-landsby nord",
-        icon=None,
-        x=337,
-        y=64,
-        z=-853,
-    ),
-]
diff --git a/src/marker_sets/overworld/villages/smedby.py b/src/marker_sets/overworld/villages/smedby.py
deleted file mode 100644
index 472afdb..0000000
--- a/src/marker_sets/overworld/villages/smedby.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from lib_marker import Point
-
-MARKERS = [
-    Point(
-        name="Smedby",
-        icon=None,
-        x=-1760,
-        y=64,
-        z=-2440,
-    ),
-]
diff --git a/src/marker_sets/nether/other/__init__.py b/src/marker_sets/the_end/other.py
similarity index 58%
rename from src/marker_sets/nether/other/__init__.py
rename to src/marker_sets/the_end/other.py
index a1e1630..6d160b7 100644
--- a/src/marker_sets/nether/other/__init__.py
+++ b/src/marker_sets/the_end/other.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(
diff --git a/src/marker_sets/the_end/portals/__init__.py b/src/marker_sets/the_end/portals.py
similarity index 59%
rename from src/marker_sets/the_end/portals/__init__.py
rename to src/marker_sets/the_end/portals.py
index 3e036bc..07f8e47 100644
--- a/src/marker_sets/the_end/portals/__init__.py
+++ b/src/marker_sets/the_end/portals.py
@@ -1,4 +1,4 @@
-from lib_marker.marker_set import MarkerSet
+from lib_marker import MarkerSet
 
 
 MARKER_SET = MarkerSet(