diff --git a/src/main/java/baritone/BaritoneProvider.java b/src/main/java/baritone/BaritoneProvider.java
index e07969d6..416f1cae 100644
--- a/src/main/java/baritone/BaritoneProvider.java
+++ b/src/main/java/baritone/BaritoneProvider.java
@@ -20,7 +20,7 @@ package baritone;
 import baritone.api.IBaritone;
 import baritone.api.IBaritoneProvider;
 import baritone.api.cache.IWorldScanner;
-import baritone.api.utils.command.BaritoneChatControl;
+import baritone.utils.command.BaritoneChatControl;
 import baritone.cache.WorldScanner;
 
 import java.util.Collections;
diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java
index ec8ade72..20f34fcf 100644
--- a/src/main/java/baritone/utils/GuiClick.java
+++ b/src/main/java/baritone/utils/GuiClick.java
@@ -23,7 +23,7 @@ import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.pathing.goals.GoalTwoBlocks;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.Helper;
-import baritone.api.utils.command.BaritoneChatControl;
+import baritone.utils.command.BaritoneChatControl;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.Entity;
diff --git a/src/api/java/baritone/api/utils/command/BaritoneChatControl.java b/src/main/java/baritone/utils/command/BaritoneChatControl.java
similarity index 99%
rename from src/api/java/baritone/api/utils/command/BaritoneChatControl.java
rename to src/main/java/baritone/utils/command/BaritoneChatControl.java
index 0c1b9fb9..d62eaebf 100644
--- a/src/api/java/baritone/api/utils/command/BaritoneChatControl.java
+++ b/src/main/java/baritone/utils/command/BaritoneChatControl.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command;
+package baritone.utils.command;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
diff --git a/src/main/java/baritone/utils/command/defaults/HelpCommand.java b/src/main/java/baritone/utils/command/defaults/HelpCommand.java
index de2a74f0..43d9829c 100644
--- a/src/main/java/baritone/utils/command/defaults/HelpCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/HelpCommand.java
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static baritone.api.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class HelpCommand extends Command {
 
diff --git a/src/main/java/baritone/utils/command/defaults/SetCommand.java b/src/main/java/baritone/utils/command/defaults/SetCommand.java
index f55b213b..822e042a 100644
--- a/src/main/java/baritone/utils/command/defaults/SetCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/SetCommand.java
@@ -41,7 +41,7 @@ import java.util.stream.Stream;
 
 import static baritone.api.utils.SettingsUtil.settingTypeToString;
 import static baritone.api.utils.SettingsUtil.settingValueToString;
-import static baritone.api.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class SetCommand extends Command {
 
diff --git a/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java b/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java
index 732682d4..b205048b 100644
--- a/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java
+++ b/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java
@@ -18,7 +18,6 @@
 package baritone.utils.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.Settings;
 import baritone.api.cache.IWaypoint;
 import baritone.api.cache.Waypoint;
 import baritone.api.pathing.goals.Goal;
@@ -44,7 +43,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import static baritone.api.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class WaypointsCommand extends Command {