diff --git a/src/api/java/baritone/api/schematic/ReplaceSchematic.java b/src/api/java/baritone/api/schematic/ReplaceSchematic.java
index d29179c8..4c7ee546 100644
--- a/src/api/java/baritone/api/schematic/ReplaceSchematic.java
+++ b/src/api/java/baritone/api/schematic/ReplaceSchematic.java
@@ -29,7 +29,7 @@ public class ReplaceSchematic extends MaskSchematic {
     public ReplaceSchematic(IBaritone baritone, ISchematic schematic, BlockOptionalMetaLookup filter) {
         super(baritone, schematic);
         this.filter = filter;
-        this.cache = new boolean[lengthZ()][heightY()][widthX()];
+        this.cache = new boolean[widthX()][heightY()][lengthZ()];
     }
 
     protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
diff --git a/src/api/java/baritone/api/utils/command/defaults/ExcCommand.java b/src/api/java/baritone/api/utils/command/defaults/ExcCommand.java
deleted file mode 100644
index 4c05bd02..00000000
--- a/src/api/java/baritone/api/utils/command/defaults/ExcCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils.command.defaults;
-
-import baritone.api.Settings;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.helpers.arguments.ArgConsumer;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class ExcCommand extends Command {
-    public ExcCommand() {
-        super("exc", "Throw an unhandled exception");
-    }
-
-    @Override
-    protected void executed(String label, ArgConsumer args, Settings settings) {
-        args.requireMax(0);
-
-        throw new RuntimeException("HI THERE");
-    }
-
-    @Override
-    protected Stream<String> tabCompleted(String label, ArgConsumer args, Settings settings) {
-        return Stream.empty();
-    }
-
-    @Override
-    public List<String> getLongDesc() {
-        return Collections.emptyList();
-    }
-}
diff --git a/src/api/java/baritone/api/utils/command/manager/CommandManager.java b/src/api/java/baritone/api/utils/command/manager/CommandManager.java
index 75dff566..287acaa5 100644
--- a/src/api/java/baritone/api/utils/command/manager/CommandManager.java
+++ b/src/api/java/baritone/api/utils/command/manager/CommandManager.java
@@ -19,7 +19,6 @@ package baritone.api.utils.command.manager;
 
 import baritone.api.utils.command.Command;
 import baritone.api.utils.command.argument.CommandArgument;
-import baritone.api.utils.command.defaults.DefaultCommands;
 import baritone.api.utils.command.execution.CommandExecution;
 import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
 import baritone.api.utils.command.registry.Registry;
@@ -35,10 +34,6 @@ import static java.util.Objects.nonNull;
 public class CommandManager {
     public static final Registry<Command> REGISTRY = new Registry<>();
 
-    static {
-        DefaultCommands.commands.forEach(REGISTRY::register);
-    }
-
     /**
      * @param name The command name to search for.
      * @return The command, if found.
diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java
index a0e19015..0b7e614f 100755
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -24,12 +24,14 @@ import baritone.api.event.listener.IEventBus;
 import baritone.api.utils.command.BaritoneChatControl;
 import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
+import baritone.api.utils.command.manager.CommandManager;
 import baritone.behavior.*;
 import baritone.cache.WorldProvider;
 import baritone.event.GameEventHandler;
 import baritone.process.*;
 import baritone.selection.SelectionManager;
 import baritone.utils.*;
+import baritone.utils.command.defaults.DefaultCommands;
 import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;
 
@@ -111,6 +113,8 @@ public class Baritone implements IBaritone {
             memoryBehavior = new MemoryBehavior(this);
             inventoryBehavior = new InventoryBehavior(this);
             inputOverrideHandler = new InputOverrideHandler(this);
+
+            DefaultCommands.commands.forEach(CommandManager.REGISTRY::register);
             new BaritoneChatControl(this);
         }
 
diff --git a/src/api/java/baritone/api/utils/command/defaults/AxisCommand.java b/src/main/java/baritone/utils/command/defaults/AxisCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/AxisCommand.java
rename to src/main/java/baritone/utils/command/defaults/AxisCommand.java
index 367bc698..59f63867 100644
--- a/src/api/java/baritone/api/utils/command/defaults/AxisCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/AxisCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
diff --git a/src/api/java/baritone/api/utils/command/defaults/BlacklistCommand.java b/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/BlacklistCommand.java
rename to src/main/java/baritone/utils/command/defaults/BlacklistCommand.java
index e51fa5fc..bb19480f 100644
--- a/src/api/java/baritone/api/utils/command/defaults/BlacklistCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.process.IGetToBlockProcess;
diff --git a/src/api/java/baritone/api/utils/command/defaults/BuildCommand.java b/src/main/java/baritone/utils/command/defaults/BuildCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/BuildCommand.java
rename to src/main/java/baritone/utils/command/defaults/BuildCommand.java
index c18cc1a4..1c64f118 100644
--- a/src/api/java/baritone/api/utils/command/defaults/BuildCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/BuildCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BetterBlockPos;
diff --git a/src/api/java/baritone/api/utils/command/defaults/CancelCommand.java b/src/main/java/baritone/utils/command/defaults/CancelCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/CancelCommand.java
rename to src/main/java/baritone/utils/command/defaults/CancelCommand.java
index 416feae5..a07bfc3b 100644
--- a/src/api/java/baritone/api/utils/command/defaults/CancelCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/CancelCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ChestsCommand.java b/src/main/java/baritone/utils/command/defaults/ChestsCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/ChestsCommand.java
rename to src/main/java/baritone/utils/command/defaults/ChestsCommand.java
index a9ca11fb..6d4fac07 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ChestsCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ChestsCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.cache.IRememberedInventory;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ClearareaCommand.java b/src/main/java/baritone/utils/command/defaults/ClearareaCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/ClearareaCommand.java
rename to src/main/java/baritone/utils/command/defaults/ClearareaCommand.java
index f3da2913..974a9867 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ClearareaCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ClearareaCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ClickCommand.java b/src/main/java/baritone/utils/command/defaults/ClickCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/ClickCommand.java
rename to src/main/java/baritone/utils/command/defaults/ClickCommand.java
index 120b5867..559752bd 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ClickCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ClickCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ComeCommand.java b/src/main/java/baritone/utils/command/defaults/ComeCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/ComeCommand.java
rename to src/main/java/baritone/utils/command/defaults/ComeCommand.java
index 9817afb7..0b5f40ce 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ComeCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ComeCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.GoalBlock;
diff --git a/src/api/java/baritone/api/utils/command/defaults/CommandAlias.java b/src/main/java/baritone/utils/command/defaults/CommandAlias.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/CommandAlias.java
rename to src/main/java/baritone/utils/command/defaults/CommandAlias.java
index 94fcd4ed..0ffaf427 100644
--- a/src/api/java/baritone/api/utils/command/defaults/CommandAlias.java
+++ b/src/main/java/baritone/utils/command/defaults/CommandAlias.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/DefaultCommands.java b/src/main/java/baritone/utils/command/defaults/DefaultCommands.java
similarity index 95%
rename from src/api/java/baritone/api/utils/command/defaults/DefaultCommands.java
rename to src/main/java/baritone/utils/command/defaults/DefaultCommands.java
index d640f079..a52d252a 100644
--- a/src/api/java/baritone/api/utils/command/defaults/DefaultCommands.java
+++ b/src/main/java/baritone/utils/command/defaults/DefaultCommands.java
@@ -15,9 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.utils.command.Command;
+import baritone.api.utils.command.manager.CommandManager;
 
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +31,6 @@ public class DefaultCommands {
         new SetCommand(),
         new CommandAlias(asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"),
         new CommandAlias("reset", "Reset all settings or just one", "set reset"),
-        new ExcCommand(), // TODO: remove this debug command... eventually
         new GoalCommand(),
         new PathCommand(),
         new ProcCommand(),
diff --git a/src/api/java/baritone/api/utils/command/defaults/EmptyCommand.java b/src/main/java/baritone/utils/command/defaults/EmptyCommand.java
similarity index 95%
rename from src/api/java/baritone/api/utils/command/defaults/EmptyCommand.java
rename to src/main/java/baritone/utils/command/defaults/EmptyCommand.java
index 1b5934ba..15951182 100644
--- a/src/api/java/baritone/api/utils/command/defaults/EmptyCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/EmptyCommand.java
@@ -15,10 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
-import baritone.api.utils.Helper;
 import baritone.api.utils.command.Command;
 import baritone.api.utils.command.helpers.arguments.ArgConsumer;
 
diff --git a/src/api/java/baritone/api/utils/command/defaults/ExploreCommand.java b/src/main/java/baritone/utils/command/defaults/ExploreCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/ExploreCommand.java
rename to src/main/java/baritone/utils/command/defaults/ExploreCommand.java
index a4b2d746..24e02f26 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ExploreCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ExploreCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.GoalXZ;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ExploreFilterCommand.java b/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/ExploreFilterCommand.java
rename to src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java
index 1dd48512..848e913b 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ExploreFilterCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/FarmCommand.java b/src/main/java/baritone/utils/command/defaults/FarmCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/FarmCommand.java
rename to src/main/java/baritone/utils/command/defaults/FarmCommand.java
index 1828dec3..8c265912 100644
--- a/src/api/java/baritone/api/utils/command/defaults/FarmCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/FarmCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/FindCommand.java b/src/main/java/baritone/utils/command/defaults/FindCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/FindCommand.java
rename to src/main/java/baritone/utils/command/defaults/FindCommand.java
index 1f9ce9a7..6fd620d1 100644
--- a/src/api/java/baritone/api/utils/command/defaults/FindCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/FindCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BetterBlockPos;
diff --git a/src/api/java/baritone/api/utils/command/defaults/FollowCommand.java b/src/main/java/baritone/utils/command/defaults/FollowCommand.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/defaults/FollowCommand.java
rename to src/main/java/baritone/utils/command/defaults/FollowCommand.java
index 6cfaa59b..0107ee3b 100644
--- a/src/api/java/baritone/api/utils/command/defaults/FollowCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/FollowCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/ForceCancelCommand.java
rename to src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java
index e78cb696..685db0c3 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ForceCancelCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.behavior.IPathingBehavior;
diff --git a/src/api/java/baritone/api/utils/command/defaults/GcCommand.java b/src/main/java/baritone/utils/command/defaults/GcCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/GcCommand.java
rename to src/main/java/baritone/utils/command/defaults/GcCommand.java
index 7790f2a4..17e241cf 100644
--- a/src/api/java/baritone/api/utils/command/defaults/GcCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/GcCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/GoalCommand.java b/src/main/java/baritone/utils/command/defaults/GoalCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/GoalCommand.java
rename to src/main/java/baritone/utils/command/defaults/GoalCommand.java
index 692d6422..883aed7e 100644
--- a/src/api/java/baritone/api/utils/command/defaults/GoalCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/GoalCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
diff --git a/src/api/java/baritone/api/utils/command/defaults/HelpCommand.java b/src/main/java/baritone/utils/command/defaults/HelpCommand.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/defaults/HelpCommand.java
rename to src/main/java/baritone/utils/command/defaults/HelpCommand.java
index a4ec3f23..16bb128a 100644
--- a/src/api/java/baritone/api/utils/command/defaults/HelpCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/HelpCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/InvertCommand.java b/src/main/java/baritone/utils/command/defaults/InvertCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/InvertCommand.java
rename to src/main/java/baritone/utils/command/defaults/InvertCommand.java
index da420db8..a29f2c9b 100644
--- a/src/api/java/baritone/api/utils/command/defaults/InvertCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/InvertCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
diff --git a/src/api/java/baritone/api/utils/command/defaults/MineCommand.java b/src/main/java/baritone/utils/command/defaults/MineCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/MineCommand.java
rename to src/main/java/baritone/utils/command/defaults/MineCommand.java
index 1cd869d8..ebfb7fe1 100644
--- a/src/api/java/baritone/api/utils/command/defaults/MineCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/MineCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BlockOptionalMeta;
diff --git a/src/api/java/baritone/api/utils/command/defaults/PathCommand.java b/src/main/java/baritone/utils/command/defaults/PathCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/PathCommand.java
rename to src/main/java/baritone/utils/command/defaults/PathCommand.java
index c184db7f..d65819fa 100644
--- a/src/api/java/baritone/api/utils/command/defaults/PathCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/PathCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
diff --git a/src/api/java/baritone/api/utils/command/defaults/PauseResumeCommands.java b/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/defaults/PauseResumeCommands.java
rename to src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java
index 8696a2da..2b3919e4 100644
--- a/src/api/java/baritone/api/utils/command/defaults/PauseResumeCommands.java
+++ b/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ProcCommand.java b/src/main/java/baritone/utils/command/defaults/ProcCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/ProcCommand.java
rename to src/main/java/baritone/utils/command/defaults/ProcCommand.java
index fdbb0a40..469089f6 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ProcCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ProcCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.calc.IPathingControlManager;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ReloadAllCommand.java b/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/ReloadAllCommand.java
rename to src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java
index 633701ba..73a0245d 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ReloadAllCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/RenderCommand.java b/src/main/java/baritone/utils/command/defaults/RenderCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/RenderCommand.java
rename to src/main/java/baritone/utils/command/defaults/RenderCommand.java
index 82398b35..3fa07ca3 100644
--- a/src/api/java/baritone/api/utils/command/defaults/RenderCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/RenderCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BetterBlockPos;
diff --git a/src/api/java/baritone/api/utils/command/defaults/RepackCommand.java b/src/main/java/baritone/utils/command/defaults/RepackCommand.java
similarity index 98%
rename from src/api/java/baritone/api/utils/command/defaults/RepackCommand.java
rename to src/main/java/baritone/utils/command/defaults/RepackCommand.java
index d371603e..0cf2ae78 100644
--- a/src/api/java/baritone/api/utils/command/defaults/RepackCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/RepackCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.cache.ICachedWorld;
diff --git a/src/api/java/baritone/api/utils/command/defaults/SaveAllCommand.java b/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/SaveAllCommand.java
rename to src/main/java/baritone/utils/command/defaults/SaveAllCommand.java
index 163408cc..a34a6a58 100644
--- a/src/api/java/baritone/api/utils/command/defaults/SaveAllCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/SchematicaCommand.java b/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/SchematicaCommand.java
rename to src/main/java/baritone/utils/command/defaults/SchematicaCommand.java
index 2522674f..edef29a7 100644
--- a/src/api/java/baritone/api/utils/command/defaults/SchematicaCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/SelCommand.java b/src/main/java/baritone/utils/command/defaults/SelCommand.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/defaults/SelCommand.java
rename to src/main/java/baritone/utils/command/defaults/SelCommand.java
index 446724dc..c6529d3d 100644
--- a/src/api/java/baritone/api/utils/command/defaults/SelCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/SelCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.event.events.RenderEvent;
diff --git a/src/api/java/baritone/api/utils/command/defaults/SetCommand.java b/src/main/java/baritone/utils/command/defaults/SetCommand.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/defaults/SetCommand.java
rename to src/main/java/baritone/utils/command/defaults/SetCommand.java
index 90f4e351..3bf6267e 100644
--- a/src/api/java/baritone/api/utils/command/defaults/SetCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/SetCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.SettingsUtil;
diff --git a/src/api/java/baritone/api/utils/command/defaults/ThisWayCommand.java b/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/ThisWayCommand.java
rename to src/main/java/baritone/utils/command/defaults/ThisWayCommand.java
index 5eeeeba9..d16dbd94 100644
--- a/src/api/java/baritone/api/utils/command/defaults/ThisWayCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.GoalXZ;
diff --git a/src/api/java/baritone/api/utils/command/defaults/TunnelCommand.java b/src/main/java/baritone/utils/command/defaults/TunnelCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/TunnelCommand.java
rename to src/main/java/baritone/utils/command/defaults/TunnelCommand.java
index 62b47562..00d9e67c 100644
--- a/src/api/java/baritone/api/utils/command/defaults/TunnelCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/TunnelCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
diff --git a/src/api/java/baritone/api/utils/command/defaults/VersionCommand.java b/src/main/java/baritone/utils/command/defaults/VersionCommand.java
similarity index 97%
rename from src/api/java/baritone/api/utils/command/defaults/VersionCommand.java
rename to src/main/java/baritone/utils/command/defaults/VersionCommand.java
index a232ddc3..6cd06f9c 100644
--- a/src/api/java/baritone/api/utils/command/defaults/VersionCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/VersionCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;
diff --git a/src/api/java/baritone/api/utils/command/defaults/WaypointsCommand.java b/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/defaults/WaypointsCommand.java
rename to src/main/java/baritone/utils/command/defaults/WaypointsCommand.java
index 78da79af..894b23a0 100644
--- a/src/api/java/baritone/api/utils/command/defaults/WaypointsCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.cache.IWaypoint;