diff --git a/src/main/java/dev/loki/loparkour/adaptive/core/MetricsCollector.java b/src/main/java/dev/loki/loparkour/adaptive/core/MetricsCollector.java
index 5d59bf6..de43733 100644
--- a/src/main/java/dev/loki/loparkour/adaptive/core/MetricsCollector.java
+++ b/src/main/java/dev/loki/loparkour/adaptive/core/MetricsCollector.java
@@ -3,7 +3,7 @@ package dev.loki.loparkour.adaptive.core;
 import dev.loki.loparkour.adaptive.model.PlayerMetrics;
 import dev.loki.loparkour.adaptive.storage.StatsRepository;
 import dev.loki.loparkour.generator.core.coordinator.GeneratorEventListener;
-import dev.loki.loparkour.generator.jump.calculation.JumpType;
+import dev.loki.loparkour.generator.jump.model.JumpType;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
diff --git a/src/main/java/dev/loki/loparkour/adaptive/core/metrics/MetricEventCollector.java b/src/main/java/dev/loki/loparkour/adaptive/core/metrics/MetricEventCollector.java
index 3b64b7b..76dd46e 100644
--- a/src/main/java/dev/loki/loparkour/adaptive/core/metrics/MetricEventCollector.java
+++ b/src/main/java/dev/loki/loparkour/adaptive/core/metrics/MetricEventCollector.java
@@ -1,7 +1,7 @@
 package dev.loki.loparkour.adaptive.core.metrics;
 
 import dev.loki.loparkour.adaptive.model.PlayerMetrics;
-import dev.loki.loparkour.generator.jump.calculation.JumpType;
+import dev.loki.loparkour.generator.jump.model.JumpType;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/loki/loparkour/bootstrap/PluginBootstrap.java b/src/main/java/dev/loki/loparkour/bootstrap/PluginBootstrap.java
index 33018bc..5fe6ab2 100644
--- a/src/main/java/dev/loki/loparkour/bootstrap/PluginBootstrap.java
+++ b/src/main/java/dev/loki/loparkour/bootstrap/PluginBootstrap.java
@@ -14,12 +14,12 @@ import dev.loki.loparkour.hook.papi.PAPIHook;
 import dev.loki.loparkour.listener.gameplay.ParkourRestrictionListener;
 import dev.loki.loparkour.listener.schematic.SchematicWandListener;
 import dev.loki.loparkour.listener.player.PlayerConnectionListener;
-import dev.loki.loparkour.elytra.mode.CloseMode;
-import dev.loki.loparkour.elytra.mode.ElytraMode;
-import dev.loki.loparkour.elytra.mode.MinSpeedMode;
-import dev.loki.loparkour.elytra.mode.ObstacleMode;
-import dev.loki.loparkour.elytra.mode.SpeedDemonMode;
-import dev.loki.loparkour.elytra.mode.TimeTrialMode;
+import dev.loki.loparkour.elytra.close.CloseMode;
+import dev.loki.loparkour.elytra.core.ElytraMode;
+import dev.loki.loparkour.elytra.minspeed.MinSpeedMode;
+import dev.loki.loparkour.elytra.obstacle.ObstacleMode;
+import dev.loki.loparkour.elytra.speeddemon.SpeedDemonMode;
+import dev.loki.loparkour.elytra.timetrial.TimeTrialMode;
 import dev.loki.loparkour.mode.base.Modes;
 import dev.loki.loparkour.mode.impl.barrier.InvisibleBarrierMode;
 import dev.loki.loparkour.mode.impl.multi.CoopMode;
diff --git a/src/main/java/dev/loki/loparkour/command/schematic/SchematicCommandHandler.java b/src/main/java/dev/loki/loparkour/command/schematic/SchematicCommandHandler.java
index 55060a5..2c2cdc8 100644
--- a/src/main/java/dev/loki/loparkour/command/schematic/SchematicCommandHandler.java
+++ b/src/main/java/dev/loki/loparkour/command/schematic/SchematicCommandHandler.java
@@ -2,6 +2,8 @@ package dev.loki.loparkour.command.schematic;
 
 import dev.loki.loparkour.LoParkour;
 import dev.loki.loparkour.command.player.PlayerCommandHandler;
+import dev.loki.loparkour.command.schematic.wand.SchematicWand;
+import dev.loki.loparkour.command.schematic.wand.SelectionStore;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.bukkit.Location;
diff --git a/src/main/java/dev/loki/loparkour/command/schematic/SchematicWand.java b/src/main/java/dev/loki/loparkour/command/schematic/wand/SchematicWand.java
similarity index 83%
rename from src/main/java/dev/loki/loparkour/command/schematic/SchematicWand.java
rename to src/main/java/dev/loki/loparkour/command/schematic/wand/SchematicWand.java
index 2a82fea..4133b37 100644
--- a/src/main/java/dev/loki/loparkour/command/schematic/SchematicWand.java
+++ b/src/main/java/dev/loki/loparkour/command/schematic/wand/SchematicWand.java
@@ -1,5 +1,6 @@
-package dev.loki.loparkour.command.schematic;
+package dev.loki.loparkour.command.schematic.wand;
 
+import dev.loki.loparkour.command.schematic.SchematicCommandHandler;
 import dev.loki.loparkour.config.locale.Locales;
 import dev.loki.loparkour.config.options.Option;
 import dev.loki.loparkour.menu.core.screen.ParkourOption;
@@ -9,7 +10,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 
-final class SchematicWand {
+public final class SchematicWand {
 
     private static ItemStack cachedWand;
 
@@ -17,11 +18,11 @@ final class SchematicWand {
     }
 
     @NotNull
-    static ItemStack getWand() {
+    public static ItemStack getWand() {
         return build().clone();
     }
 
-    static boolean isWand(@Nullable ItemStack item) {
+    public static boolean isWand(@Nullable ItemStack item) {
         if (item == null || !item.hasItemMeta()) {
             return false;
         }
@@ -30,7 +31,7 @@ final class SchematicWand {
                 && meta.getPersistentDataContainer().has(SchematicCommandHandler.WAND_KEY, PersistentDataType.BYTE);
     }
 
-    static void clearCache() {
+    public static void clearCache() {
         cachedWand = null;
     }
 
diff --git a/src/main/java/dev/loki/loparkour/command/schematic/SelectionStore.java b/src/main/java/dev/loki/loparkour/command/schematic/wand/SelectionStore.java
similarity index 65%
rename from src/main/java/dev/loki/loparkour/command/schematic/SelectionStore.java
rename to src/main/java/dev/loki/loparkour/command/schematic/wand/SelectionStore.java
index 23152f2..09510f0 100644
--- a/src/main/java/dev/loki/loparkour/command/schematic/SelectionStore.java
+++ b/src/main/java/dev/loki/loparkour/command/schematic/wand/SelectionStore.java
@@ -1,16 +1,17 @@
-package dev.loki.loparkour.command.schematic;
+package dev.loki.loparkour.command.schematic.wand;
 
+import dev.loki.loparkour.command.schematic.SchematicCommandHandler;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-final class SelectionStore {
+public final class SelectionStore {
 
     private SelectionStore() {
     }
 
     @NotNull
-    static Location[] get(@NotNull Player player) {
+    public static Location[] get(@NotNull Player player) {
         Location[] sel = SchematicCommandHandler.SELECTIONS.get(player);
         if (sel == null) {
             sel = new Location[]{null, null};
@@ -19,7 +20,7 @@ final class SelectionStore {
         return sel;
     }
 
-    static void set(@NotNull Player player, @NotNull Location loc, int index) {
+    public static void set(@NotNull Player player, @NotNull Location loc, int index) {
         final Location[] updated = get(player).clone();
         updated[index] = loc.clone();
         SchematicCommandHandler.SELECTIONS.put(player, updated);
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/CloseGenerator.java b/src/main/java/dev/loki/loparkour/elytra/close/CloseGenerator.java
similarity index 77%
rename from src/main/java/dev/loki/loparkour/elytra/generator/CloseGenerator.java
rename to src/main/java/dev/loki/loparkour/elytra/close/CloseGenerator.java
index 3c0bd70..ee253af 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/CloseGenerator.java
+++ b/src/main/java/dev/loki/loparkour/elytra/close/CloseGenerator.java
@@ -1,5 +1,6 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.close;
 
+import dev.loki.loparkour.elytra.core.ElytraGenerator;
 import dev.loki.loparkour.elytra.section.ElytraPointType;
 import dev.loki.loparkour.session.core.Session;
 
diff --git a/src/main/java/dev/loki/loparkour/elytra/mode/CloseMode.java b/src/main/java/dev/loki/loparkour/elytra/close/CloseMode.java
similarity index 93%
rename from src/main/java/dev/loki/loparkour/elytra/mode/CloseMode.java
rename to src/main/java/dev/loki/loparkour/elytra/close/CloseMode.java
index 6132cdb..aecedb5 100644
--- a/src/main/java/dev/loki/loparkour/elytra/mode/CloseMode.java
+++ b/src/main/java/dev/loki/loparkour/elytra/close/CloseMode.java
@@ -1,7 +1,6 @@
-package dev.loki.loparkour.elytra.mode;
+package dev.loki.loparkour.elytra.close;
 
 import dev.loki.loparkour.config.locale.Locales;
-import dev.loki.loparkour.elytra.generator.CloseGenerator;
 import dev.loki.loparkour.leaderboard.core.Leaderboard;
 import dev.loki.loparkour.mode.base.Mode;
 import dev.loki.loparkour.mode.base.ModeMessages;
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/ElytraBoost.java b/src/main/java/dev/loki/loparkour/elytra/core/ElytraBoost.java
similarity index 98%
rename from src/main/java/dev/loki/loparkour/elytra/generator/ElytraBoost.java
rename to src/main/java/dev/loki/loparkour/elytra/core/ElytraBoost.java
index 7acbd30..53c2fde 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/ElytraBoost.java
+++ b/src/main/java/dev/loki/loparkour/elytra/core/ElytraBoost.java
@@ -1,4 +1,4 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.core;
 
 import dev.loki.loparkour.elytra.section.ElytraSection;
 import dev.loki.loparkour.util.misc.Compat;
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/ElytraGenerator.java b/src/main/java/dev/loki/loparkour/elytra/core/ElytraGenerator.java
similarity index 99%
rename from src/main/java/dev/loki/loparkour/elytra/generator/ElytraGenerator.java
rename to src/main/java/dev/loki/loparkour/elytra/core/ElytraGenerator.java
index 115ac66..894ae1a 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/ElytraGenerator.java
+++ b/src/main/java/dev/loki/loparkour/elytra/core/ElytraGenerator.java
@@ -1,4 +1,4 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.core;
 
 import dev.loki.loparkour.config.core.Config;
 import dev.loki.loparkour.elytra.section.ClientBlockChanger;
diff --git a/src/main/java/dev/loki/loparkour/elytra/mode/ElytraMode.java b/src/main/java/dev/loki/loparkour/elytra/core/ElytraMode.java
similarity index 93%
rename from src/main/java/dev/loki/loparkour/elytra/mode/ElytraMode.java
rename to src/main/java/dev/loki/loparkour/elytra/core/ElytraMode.java
index 03188ad..4d0c5f3 100644
--- a/src/main/java/dev/loki/loparkour/elytra/mode/ElytraMode.java
+++ b/src/main/java/dev/loki/loparkour/elytra/core/ElytraMode.java
@@ -1,7 +1,6 @@
-package dev.loki.loparkour.elytra.mode;
+package dev.loki.loparkour.elytra.core;
 
 import dev.loki.loparkour.config.locale.Locales;
-import dev.loki.loparkour.elytra.generator.ElytraGenerator;
 import dev.loki.loparkour.leaderboard.core.Leaderboard;
 import dev.loki.loparkour.mode.base.Mode;
 import dev.loki.loparkour.mode.base.ModeMessages;
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/MinSpeedGenerator.java b/src/main/java/dev/loki/loparkour/elytra/minspeed/MinSpeedGenerator.java
similarity index 94%
rename from src/main/java/dev/loki/loparkour/elytra/generator/MinSpeedGenerator.java
rename to src/main/java/dev/loki/loparkour/elytra/minspeed/MinSpeedGenerator.java
index beb0d72..8514849 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/MinSpeedGenerator.java
+++ b/src/main/java/dev/loki/loparkour/elytra/minspeed/MinSpeedGenerator.java
@@ -1,6 +1,7 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.minspeed;
 
 import dev.loki.loparkour.config.core.Config;
+import dev.loki.loparkour.elytra.core.ElytraGenerator;
 import dev.loki.loparkour.session.core.Session;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/dev/loki/loparkour/elytra/mode/MinSpeedMode.java b/src/main/java/dev/loki/loparkour/elytra/minspeed/MinSpeedMode.java
similarity index 93%
rename from src/main/java/dev/loki/loparkour/elytra/mode/MinSpeedMode.java
rename to src/main/java/dev/loki/loparkour/elytra/minspeed/MinSpeedMode.java
index 4393367..d5d814b 100644
--- a/src/main/java/dev/loki/loparkour/elytra/mode/MinSpeedMode.java
+++ b/src/main/java/dev/loki/loparkour/elytra/minspeed/MinSpeedMode.java
@@ -1,7 +1,6 @@
-package dev.loki.loparkour.elytra.mode;
+package dev.loki.loparkour.elytra.minspeed;
 
 import dev.loki.loparkour.config.locale.Locales;
-import dev.loki.loparkour.elytra.generator.MinSpeedGenerator;
 import dev.loki.loparkour.leaderboard.core.Leaderboard;
 import dev.loki.loparkour.mode.base.Mode;
 import dev.loki.loparkour.mode.base.ModeMessages;
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/ObstacleGenerator.java b/src/main/java/dev/loki/loparkour/elytra/obstacle/ObstacleGenerator.java
similarity index 98%
rename from src/main/java/dev/loki/loparkour/elytra/generator/ObstacleGenerator.java
rename to src/main/java/dev/loki/loparkour/elytra/obstacle/ObstacleGenerator.java
index 4a1c231..09989ea 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/ObstacleGenerator.java
+++ b/src/main/java/dev/loki/loparkour/elytra/obstacle/ObstacleGenerator.java
@@ -1,6 +1,7 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.obstacle;
 
 import dev.loki.loparkour.config.core.Config;
+import dev.loki.loparkour.elytra.core.ElytraGenerator;
 import dev.loki.loparkour.elytra.section.ElytraPointType;
 import dev.loki.loparkour.elytra.section.ElytraSection;
 import dev.loki.loparkour.session.core.Session;
diff --git a/src/main/java/dev/loki/loparkour/elytra/mode/ObstacleMode.java b/src/main/java/dev/loki/loparkour/elytra/obstacle/ObstacleMode.java
similarity index 93%
rename from src/main/java/dev/loki/loparkour/elytra/mode/ObstacleMode.java
rename to src/main/java/dev/loki/loparkour/elytra/obstacle/ObstacleMode.java
index 238db94..74d68af 100644
--- a/src/main/java/dev/loki/loparkour/elytra/mode/ObstacleMode.java
+++ b/src/main/java/dev/loki/loparkour/elytra/obstacle/ObstacleMode.java
@@ -1,7 +1,6 @@
-package dev.loki.loparkour.elytra.mode;
+package dev.loki.loparkour.elytra.obstacle;
 
 import dev.loki.loparkour.config.locale.Locales;
-import dev.loki.loparkour.elytra.generator.ObstacleGenerator;
 import dev.loki.loparkour.leaderboard.core.Leaderboard;
 import dev.loki.loparkour.mode.base.Mode;
 import dev.loki.loparkour.mode.base.ModeMessages;
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/SpeedDemonGenerator.java b/src/main/java/dev/loki/loparkour/elytra/speeddemon/SpeedDemonGenerator.java
similarity index 90%
rename from src/main/java/dev/loki/loparkour/elytra/generator/SpeedDemonGenerator.java
rename to src/main/java/dev/loki/loparkour/elytra/speeddemon/SpeedDemonGenerator.java
index e3ef007..cf92499 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/SpeedDemonGenerator.java
+++ b/src/main/java/dev/loki/loparkour/elytra/speeddemon/SpeedDemonGenerator.java
@@ -1,5 +1,6 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.speeddemon;
 
+import dev.loki.loparkour.elytra.core.ElytraGenerator;
 import dev.loki.loparkour.session.core.Session;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/dev/loki/loparkour/elytra/mode/SpeedDemonMode.java b/src/main/java/dev/loki/loparkour/elytra/speeddemon/SpeedDemonMode.java
similarity index 93%
rename from src/main/java/dev/loki/loparkour/elytra/mode/SpeedDemonMode.java
rename to src/main/java/dev/loki/loparkour/elytra/speeddemon/SpeedDemonMode.java
index 19600a1..b8948e7 100644
--- a/src/main/java/dev/loki/loparkour/elytra/mode/SpeedDemonMode.java
+++ b/src/main/java/dev/loki/loparkour/elytra/speeddemon/SpeedDemonMode.java
@@ -1,7 +1,6 @@
-package dev.loki.loparkour.elytra.mode;
+package dev.loki.loparkour.elytra.speeddemon;
 
 import dev.loki.loparkour.config.locale.Locales;
-import dev.loki.loparkour.elytra.generator.SpeedDemonGenerator;
 import dev.loki.loparkour.leaderboard.core.Leaderboard;
 import dev.loki.loparkour.mode.base.Mode;
 import dev.loki.loparkour.mode.base.ModeMessages;
diff --git a/src/main/java/dev/loki/loparkour/elytra/generator/TimeTrialGenerator.java b/src/main/java/dev/loki/loparkour/elytra/timetrial/TimeTrialGenerator.java
similarity index 84%
rename from src/main/java/dev/loki/loparkour/elytra/generator/TimeTrialGenerator.java
rename to src/main/java/dev/loki/loparkour/elytra/timetrial/TimeTrialGenerator.java
index 71b9117..e659844 100644
--- a/src/main/java/dev/loki/loparkour/elytra/generator/TimeTrialGenerator.java
+++ b/src/main/java/dev/loki/loparkour/elytra/timetrial/TimeTrialGenerator.java
@@ -1,6 +1,7 @@
-package dev.loki.loparkour.elytra.generator;
+package dev.loki.loparkour.elytra.timetrial;
 
 import dev.loki.loparkour.config.core.Config;
+import dev.loki.loparkour.elytra.core.ElytraGenerator;
 import dev.loki.loparkour.session.core.Session;
 
 /**
diff --git a/src/main/java/dev/loki/loparkour/elytra/mode/TimeTrialMode.java b/src/main/java/dev/loki/loparkour/elytra/timetrial/TimeTrialMode.java
similarity index 93%
rename from src/main/java/dev/loki/loparkour/elytra/mode/TimeTrialMode.java
rename to src/main/java/dev/loki/loparkour/elytra/timetrial/TimeTrialMode.java
index 5ccb3da..536da77 100644
--- a/src/main/java/dev/loki/loparkour/elytra/mode/TimeTrialMode.java
+++ b/src/main/java/dev/loki/loparkour/elytra/timetrial/TimeTrialMode.java
@@ -1,7 +1,6 @@
-package dev.loki.loparkour.elytra.mode;
+package dev.loki.loparkour.elytra.timetrial;
 
 import dev.loki.loparkour.config.locale.Locales;
-import dev.loki.loparkour.elytra.generator.TimeTrialGenerator;
 import dev.loki.loparkour.leaderboard.core.Leaderboard;
 import dev.loki.loparkour.mode.base.Mode;
 import dev.loki.loparkour.mode.base.ModeMessages;
diff --git a/src/main/java/dev/loki/loparkour/generator/core/coordinator/GeneratorEventListener.java b/src/main/java/dev/loki/loparkour/generator/core/coordinator/GeneratorEventListener.java
index 7180005..afabe00 100644
--- a/src/main/java/dev/loki/loparkour/generator/core/coordinator/GeneratorEventListener.java
+++ b/src/main/java/dev/loki/loparkour/generator/core/coordinator/GeneratorEventListener.java
@@ -1,6 +1,6 @@
 package dev.loki.loparkour.generator.core.coordinator;
 
-import dev.loki.loparkour.generator.jump.calculation.JumpType;
+import dev.loki.loparkour.generator.jump.model.JumpType;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/loki/loparkour/generator/jump/calculation/JumpType.java b/src/main/java/dev/loki/loparkour/generator/jump/model/JumpType.java
similarity index 96%
rename from src/main/java/dev/loki/loparkour/generator/jump/calculation/JumpType.java
rename to src/main/java/dev/loki/loparkour/generator/jump/model/JumpType.java
index 58e277e..1c2837f 100644
--- a/src/main/java/dev/loki/loparkour/generator/jump/calculation/JumpType.java
+++ b/src/main/java/dev/loki/loparkour/generator/jump/model/JumpType.java
@@ -1,4 +1,4 @@
-package dev.loki.loparkour.generator.jump.calculation;
+package dev.loki.loparkour.generator.jump.model;
 
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockPlacer.java b/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockPlacer.java
index cf659f0..e91f2d4 100644
--- a/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockPlacer.java
+++ b/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockPlacer.java
@@ -2,6 +2,7 @@ package dev.loki.loparkour.generator.jump.placement;
 
 import dev.loki.loparkour.generator.core.coordinator.ParkourGenerator;
 import dev.loki.loparkour.generator.jump.calculation.JumpCalculator;
+import dev.loki.loparkour.generator.jump.placement.schematic.SchematicBlockPlacer;
 import dev.loki.loparkour.util.misc.Probs;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
diff --git a/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockSelector.java b/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockSelector.java
index c430a08..c5096d9 100644
--- a/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockSelector.java
+++ b/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockSelector.java
@@ -2,7 +2,7 @@ package dev.loki.loparkour.generator.jump.placement;
 
 import dev.loki.loparkour.api.core.Registry;
 import dev.loki.loparkour.generator.core.coordinator.ParkourGenerator;
-import dev.loki.loparkour.generator.jump.calculation.JumpType;
+import dev.loki.loparkour.generator.jump.model.JumpType;
 import dev.loki.loparkour.style.core.Style;
 import dev.loki.loparkour.util.misc.MaterialUtil;
 import org.bukkit.Material;
diff --git a/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockTargetSelector.java b/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockTargetSelector.java
index 44edd16..d6a832b 100644
--- a/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockTargetSelector.java
+++ b/src/main/java/dev/loki/loparkour/generator/jump/placement/BlockTargetSelector.java
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * Computes the target block position for generated parkour blocks based on jump parameters.
  */
-class BlockTargetSelector {
+public class BlockTargetSelector {
 
     private static final int NO_FORCED_HEIGHT = Integer.MIN_VALUE;
 
@@ -32,7 +32,7 @@ class BlockTargetSelector {
     }
 
     @NotNull
-    List<Block> selectBlocks() {
+    public List<Block> selectBlocks() {
         return selectBlocks(NO_FORCED_HEIGHT);
     }
 
diff --git a/src/main/java/dev/loki/loparkour/generator/jump/placement/SchematicBlockPlacer.java b/src/main/java/dev/loki/loparkour/generator/jump/placement/schematic/SchematicBlockPlacer.java
similarity index 85%
rename from src/main/java/dev/loki/loparkour/generator/jump/placement/SchematicBlockPlacer.java
rename to src/main/java/dev/loki/loparkour/generator/jump/placement/schematic/SchematicBlockPlacer.java
index db3392d..fcf3bb8 100644
--- a/src/main/java/dev/loki/loparkour/generator/jump/placement/SchematicBlockPlacer.java
+++ b/src/main/java/dev/loki/loparkour/generator/jump/placement/schematic/SchematicBlockPlacer.java
@@ -1,8 +1,9 @@
-package dev.loki.loparkour.generator.jump.placement;
+package dev.loki.loparkour.generator.jump.placement.schematic;
 
 import dev.loki.loparkour.LoParkour;
 import dev.loki.loparkour.api.event.generation.ParkourSchematicGenerateEvent;
 import dev.loki.loparkour.generator.core.coordinator.ParkourGenerator;
+import dev.loki.loparkour.generator.jump.placement.BlockTargetSelector;
 import dev.loki.loparkour.player.core.ParkourPlayer;
 import dev.loki.loparkour.schematic.core.ParkourSchematic;
 import dev.loki.loparkour.schematic.core.SchematicManager;
@@ -15,17 +16,17 @@ import java.util.List;
 /**
  * Pastes schematic parkour sections into the world and fires the related event.
  */
-class SchematicBlockPlacer {
+public class SchematicBlockPlacer {
 
     private final ParkourGenerator generator;
     private final BlockTargetSelector targetSelector;
 
-    SchematicBlockPlacer(@NotNull ParkourGenerator generator, @NotNull BlockTargetSelector targetSelector) {
+    public SchematicBlockPlacer(@NotNull ParkourGenerator generator, @NotNull BlockTargetSelector targetSelector) {
         this.generator = generator;
         this.targetSelector = targetSelector;
     }
 
-    boolean placeSchematic() {
+    public boolean placeSchematic() {
         final SchematicManager manager = LoParkour.getSchematicManager();
         if (manager == null) {
             return false;
diff --git a/src/main/java/dev/loki/loparkour/mode/base/Modes.java b/src/main/java/dev/loki/loparkour/mode/base/Modes.java
index 96a5a64..90b5fdd 100644
--- a/src/main/java/dev/loki/loparkour/mode/base/Modes.java
+++ b/src/main/java/dev/loki/loparkour/mode/base/Modes.java
@@ -2,12 +2,12 @@ package dev.loki.loparkour.mode.base;
 
 import dev.loki.loparkour.api.core.Registry;
 import dev.loki.loparkour.duels.DuelsMode;
-import dev.loki.loparkour.elytra.mode.CloseMode;
-import dev.loki.loparkour.elytra.mode.ElytraMode;
-import dev.loki.loparkour.elytra.mode.MinSpeedMode;
-import dev.loki.loparkour.elytra.mode.ObstacleMode;
-import dev.loki.loparkour.elytra.mode.SpeedDemonMode;
-import dev.loki.loparkour.elytra.mode.TimeTrialMode;
+import dev.loki.loparkour.elytra.close.CloseMode;
+import dev.loki.loparkour.elytra.core.ElytraMode;
+import dev.loki.loparkour.elytra.minspeed.MinSpeedMode;
+import dev.loki.loparkour.elytra.obstacle.ObstacleMode;
+import dev.loki.loparkour.elytra.speeddemon.SpeedDemonMode;
+import dev.loki.loparkour.elytra.timetrial.TimeTrialMode;
 import dev.loki.loparkour.mode.impl.barrier.InvisibleBarrierMode;
 import dev.loki.loparkour.mode.impl.multi.CoopMode;
 import dev.loki.loparkour.mode.impl.multi.RaceMode;
diff --git a/src/main/java/dev/loki/loparkour/player/core/ParkourPlayer.java b/src/main/java/dev/loki/loparkour/player/core/ParkourPlayer.java
index ff9ea3a..7047e53 100644
--- a/src/main/java/dev/loki/loparkour/player/core/ParkourPlayer.java
+++ b/src/main/java/dev/loki/loparkour/player/core/ParkourPlayer.java
@@ -8,6 +8,7 @@ import dev.loki.loparkour.menu.core.screen.ParkourOption;
 import dev.loki.loparkour.mode.base.MultiMode;
 import dev.loki.loparkour.player.data.PreviousData;
 import dev.loki.loparkour.player.service.PlayerSettingsManager;
+import dev.loki.loparkour.player.service.PlayerSpawnSetup;
 import dev.loki.loparkour.session.core.Session;
 import dev.loki.loparkour.world.core.Divider;
 import org.bukkit.Location;
diff --git a/src/main/java/dev/loki/loparkour/player/core/PlayerSpawnSetup.java b/src/main/java/dev/loki/loparkour/player/service/PlayerSpawnSetup.java
similarity index 77%
rename from src/main/java/dev/loki/loparkour/player/core/PlayerSpawnSetup.java
rename to src/main/java/dev/loki/loparkour/player/service/PlayerSpawnSetup.java
index 655e5a7..104469a 100644
--- a/src/main/java/dev/loki/loparkour/player/core/PlayerSpawnSetup.java
+++ b/src/main/java/dev/loki/loparkour/player/service/PlayerSpawnSetup.java
@@ -1,7 +1,8 @@
-package dev.loki.loparkour.player.core;
+package dev.loki.loparkour.player.service;
 
 import dev.loki.loparkour.LoParkour;
 import dev.loki.loparkour.config.core.Config;
+import dev.loki.loparkour.player.core.ParkourPlayer;
 import dev.loki.loparkour.player.service.ui.ParkourHotbar;
 import dev.loki.loparkour.scheduler.Scheduler;
 import org.bukkit.GameMode;
@@ -10,11 +11,11 @@ import org.bukkit.Location;
 /**
  * Prepares a parkour player's world state such as location, game mode and hotbar.
  */
-final class PlayerSpawnSetup {
+public final class PlayerSpawnSetup {
 
     private static final int HOTBAR_APPLY_DELAY = 5;
 
-    void setup(ParkourPlayer player, Location to) {
+    public void setup(ParkourPlayer player, Location to) {
         if (to != null) {
             player.teleport(to);
         }
@@ -28,7 +29,7 @@ final class PlayerSpawnSetup {
         }
     }
 
-    void updateHotbar(ParkourPlayer player) {
+    public void updateHotbar(ParkourPlayer player) {
         ParkourHotbar.apply(player);
     }
 }
diff --git a/src/test/java/dev/loki/loparkour/arch/StructureRulesTest.java b/src/test/java/dev/loki/loparkour/arch/StructureRulesTest.java
index d8c9b4a..43f749d 100644
--- a/src/test/java/dev/loki/loparkour/arch/StructureRulesTest.java
+++ b/src/test/java/dev/loki/loparkour/arch/StructureRulesTest.java
@@ -25,13 +25,7 @@ class StructureRulesTest {
     private static final int MAX_LINES_PER_FILE = 200;
 
     /** Known debt (docs/TODO.md, task 2). Remove entries as folders get split. */
-    private static final Set<String> FOLDER_DEBT = Set.of(
-            "dev/loki/loparkour/command/schematic",
-            "dev/loki/loparkour/elytra/generator",
-            "dev/loki/loparkour/elytra/mode",
-            "dev/loki/loparkour/generator/jump/calculation",
-            "dev/loki/loparkour/generator/jump/placement",
-            "dev/loki/loparkour/player/core");
+    private static final Set<String> FOLDER_DEBT = Set.of();
 
     @Test
     void foldersHaveAtMostFourFiles() throws IOException {