Refactor *.util.command to *.command

src/api/java/baritone/api/IBaritone.java

@@ -26,7 +26,7 @@ import baritone.api.process.*;
 import baritone.api.selection.ISelectionManager;
 import baritone.api.utils.IInputOverrideHandler;
 import baritone.api.utils.IPlayerContext;
-import baritone.api.utils.command.manager.ICommandManager;
+import baritone.api.command.manager.ICommandManager;
 
 /**
  * @author Brady

src/api/java/baritone/api/IBaritoneProvider.java

@@ -18,8 +18,8 @@
 package baritone.api;
 
 import baritone.api.cache.IWorldScanner;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.ICommandSystem;
+import baritone.api.command.Command;
+import baritone.api.command.ICommandSystem;
 import net.minecraft.client.entity.EntityPlayerSP;
 
 import java.util.List;

src/api/java/baritone/api/command/Command.java

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command;
+package baritone.api.command;
 
 import baritone.api.IBaritone;
 import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Collections;
 import java.util.List;

src/api/java/baritone/api/command/IBaritoneChatControl.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command;
+package baritone.api.command;
 
 import baritone.api.Settings;
 

src/api/java/baritone/api/command/ICommandSystem.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command;
+package baritone.api.command;
 
-import baritone.api.utils.command.argparser.IArgParserManager;
+import baritone.api.command.argparser.IArgParserManager;
 
 /**
  * @author Brady

src/api/java/baritone/api/command/argparser/IArgParser.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.argparser;
+package baritone.api.command.argparser;
 
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.argument.ICommandArgument;
 
 public interface IArgParser<T> {
 

src/api/java/baritone/api/command/argparser/IArgParserManager.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.argparser;
+package baritone.api.command.argparser;
 
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.registry.Registry;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.registry.Registry;
 
 /**
  * @author Brady

src/api/java/baritone/api/command/argument/ICommandArgument.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.argument;
+package baritone.api.command.argument;
 
-import baritone.api.utils.command.argparser.IArgParser;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.argparser.IArgParser;
+import baritone.api.command.exception.CommandInvalidTypeException;
 import net.minecraft.util.EnumFacing;
 
 /**

src/api/java/baritone/api/command/datatypes/BlockById.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.ResourceLocation;

src/api/java/baritone/api/command/datatypes/EntityClassById.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.util.ResourceLocation;

src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
 import baritone.api.utils.BlockOptionalMeta;
-import baritone.api.utils.command.exception.CommandException;
+import baritone.api.command.exception.CommandException;
 
 import java.util.stream.Stream;
 

src/api/java/baritone/api/command/datatypes/ForEnumFacing.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.EnumFacing;
 
 import java.util.Locale;

src/api/java/baritone/api/command/datatypes/ForWaypoints.java

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
 import baritone.api.IBaritone;
 import baritone.api.cache.IWaypoint;
 import baritone.api.cache.IWaypointCollection;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;
 
 import java.util.Comparator;
 import java.util.stream.Stream;

src/api/java/baritone/api/command/datatypes/IDatatype.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.argparser.IArgParser;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.argparser.IArgParser;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 
 import java.util.stream.Stream;
 

src/api/java/baritone/api/command/datatypes/IDatatypeContext.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 /**
  * Provides an {@link IDatatype} with contextual information so

src/api/java/baritone/api/command/datatypes/IDatatypeFor.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
+import baritone.api.command.exception.CommandException;
 
 import java.util.function.Supplier;
 

src/api/java/baritone/api/command/datatypes/IDatatypePost.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
+import baritone.api.command.exception.CommandException;
 
 import java.util.function.Function;
 

src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
+import baritone.api.command.exception.CommandException;
 
 /**
  * @author Brady

src/api/java/baritone/api/command/datatypes/NearbyPlayer.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.entity.player.EntityPlayer;
 
 import java.util.List;

src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 
 import java.util.stream.Stream;
 

src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/api/java/baritone/api/command/datatypes/RelativeFile.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 
 import java.io.File;
 import java.io.IOException;

src/api/java/baritone/api/command/datatypes/RelativeGoal.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.ArrayList;

src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.stream.Stream;

src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.stream.Stream;

src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.datatypes;
+package baritone.api.command.datatypes;
 
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.stream.Stream;

src/api/java/baritone/api/command/exception/CommandErrorMessageException.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
 public abstract class CommandErrorMessageException extends CommandException {
 

src/api/java/baritone/api/command/exception/CommandException.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
 public abstract class CommandException extends Exception implements ICommandException {
 

src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.argument.ICommandArgument;
 
 public abstract class CommandInvalidArgumentException extends CommandErrorMessageException {
 

src/api/java/baritone/api/command/exception/CommandInvalidStateException.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
 public class CommandInvalidStateException extends CommandErrorMessageException {
 

src/api/java/baritone/api/command/exception/CommandInvalidTypeException.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.argument.ICommandArgument;
 
 public class CommandInvalidTypeException extends CommandInvalidArgumentException {
 

src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
 public class CommandNoParserForTypeException extends CommandUnhandledException {
 

src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
 public class CommandNotEnoughArgumentsException extends CommandErrorMessageException {
 

src/api/java/baritone/api/command/exception/CommandNotFoundException.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.Command;
+import baritone.api.command.argument.ICommandArgument;
 
 import java.util.List;
 

src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
 public class CommandTooManyArgumentsException extends CommandErrorMessageException {
 

src/api/java/baritone/api/command/exception/CommandUnhandledException.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.Command;
+import baritone.api.command.argument.ICommandArgument;
 import net.minecraft.util.text.TextFormatting;
 
 import java.util.List;

src/api/java/baritone/api/command/exception/ICommandException.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.exception;
+package baritone.api.command.exception;
 
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.Command;
+import baritone.api.command.argument.ICommandArgument;
 import net.minecraft.util.text.TextFormatting;
 
 import java.util.List;

src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java

@@ -15,19 +15,19 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.helpers.arguments;
+package baritone.api.command.helpers.arguments;
 
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandTooManyArgumentsException;
 import baritone.api.utils.Helper;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.argparser.IArgParser;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.datatypes.IDatatype;
-import baritone.api.utils.command.datatypes.IDatatypeFor;
-import baritone.api.utils.command.datatypes.IDatatypePost;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.exception.CommandNotEnoughArgumentsException;
-import baritone.api.utils.command.exception.CommandTooManyArgumentsException;
+import baritone.api.command.argparser.IArgParser;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.datatypes.IDatatype;
+import baritone.api.command.datatypes.IDatatypeFor;
+import baritone.api.command.datatypes.IDatatypePost;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import net.minecraft.util.EnumFacing;
 
 import java.util.Deque;

src/api/java/baritone/api/command/helpers/pagination/Paginator.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.helpers.pagination;
+package baritone.api.command.helpers.pagination;
 
 import baritone.api.utils.Helper;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;

src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.helpers.tabcomplete;
+package baritone.api.command.helpers.tabcomplete;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.manager.ICommandManager;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.manager.ICommandManager;
 import net.minecraft.util.ResourceLocation;
 
 import java.util.Comparator;

src/api/java/baritone/api/command/manager/ICommandManager.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.manager;
+package baritone.api.command.manager;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.registry.Registry;
+import baritone.api.command.Command;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.registry.Registry;
 import net.minecraft.util.Tuple;
 
 import java.util.List;

src/api/java/baritone/api/command/registry/Registry.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.registry;
+package baritone.api.command.registry;
 
 import java.util.*;
 import java.util.function.Consumer;

src/main/java/baritone/Baritone.java

@@ -29,7 +29,7 @@ import baritone.event.GameEventHandler;
 import baritone.process.*;
 import baritone.selection.SelectionManager;
 import baritone.utils.*;
-import baritone.utils.command.manager.CommandManager;
+import baritone.command.manager.CommandManager;
 import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;
 

src/main/java/baritone/BaritoneProvider.java

@@ -20,10 +20,10 @@ package baritone;
 import baritone.api.IBaritone;
 import baritone.api.IBaritoneProvider;
 import baritone.api.cache.IWorldScanner;
-import baritone.api.utils.command.ICommandSystem;
-import baritone.utils.command.BaritoneChatControl;
+import baritone.api.command.ICommandSystem;
+import baritone.command.BaritoneChatControl;
 import baritone.cache.WorldScanner;
-import baritone.utils.command.CommandSystem;
+import baritone.command.CommandSystem;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/baritone/command/BaritoneChatControl.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command;
+package baritone.command;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
@@ -26,14 +26,14 @@ import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.event.listener.AbstractGameEventListener;
 import baritone.api.utils.Helper;
 import baritone.api.utils.SettingsUtil;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.exception.CommandNotEnoughArgumentsException;
-import baritone.api.utils.command.exception.CommandNotFoundException;
-import baritone.utils.command.helpers.arguments.ArgConsumer;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
-import baritone.api.utils.command.manager.ICommandManager;
-import baritone.utils.command.argument.CommandArguments;
-import baritone.utils.command.manager.CommandManager;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandNotEnoughArgumentsException;
+import baritone.api.command.exception.CommandNotFoundException;
+import baritone.command.helpers.arguments.ArgConsumer;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.manager.ICommandManager;
+import baritone.command.argument.CommandArguments;
+import baritone.command.manager.CommandManager;
 import net.minecraft.util.Tuple;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
@@ -47,7 +47,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.stream.Stream;
 
-import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class BaritoneChatControl implements Helper, AbstractGameEventListener {
 

src/main/java/baritone/command/CommandSystem.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command;
+package baritone.command;
 
-import baritone.api.utils.command.ICommandSystem;
-import baritone.utils.command.argparser.ArgParserManager;
-import baritone.api.utils.command.argparser.IArgParserManager;
+import baritone.api.command.ICommandSystem;
+import baritone.command.argparser.ArgParserManager;
+import baritone.api.command.argparser.IArgParserManager;
 
 /**
  * @author Brady

src/main/java/baritone/command/argparser/ArgParserManager.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.argparser;
+package baritone.command.argparser;
 
-import baritone.api.utils.command.argparser.IArgParser;
-import baritone.api.utils.command.argparser.IArgParserManager;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.exception.CommandNoParserForTypeException;
-import baritone.api.utils.command.registry.Registry;
+import baritone.api.command.argparser.IArgParser;
+import baritone.api.command.argparser.IArgParserManager;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.exception.CommandNoParserForTypeException;
+import baritone.api.command.registry.Registry;
 
 public enum ArgParserManager implements IArgParserManager {
     INSTANCE;

src/main/java/baritone/command/argparser/DefaultArgParsers.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.argparser;
+package baritone.command.argparser;
 
-import baritone.api.utils.command.argparser.IArgParser;
-import baritone.api.utils.command.argument.ICommandArgument;
+import baritone.api.command.argparser.IArgParser;
+import baritone.api.command.argument.ICommandArgument;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/argument/CommandArgument.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.argument;
+package baritone.command.argument;
 
-import baritone.utils.command.argparser.ArgParserManager;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
+import baritone.command.argparser.ArgParserManager;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandInvalidTypeException;
 
 import java.util.stream.Stream;
 

src/main/java/baritone/command/argument/CommandArguments.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.argument;
+package baritone.command.argument;
 
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.exception.CommandInvalidArgumentException;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandInvalidArgumentException;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/baritone/command/defaults/AxisCommand.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalAxis;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/BlacklistCommand.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.process.IGetToBlockProcess;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/BuildCommand.java

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.RelativeBlockPos;
-import baritone.api.utils.command.datatypes.RelativeFile;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.RelativeBlockPos;
+import baritone.api.command.datatypes.RelativeFile;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import net.minecraft.client.Minecraft;
 
 import java.io.File;

src/main/java/baritone/command/defaults/CancelCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/ChestsCommand.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.cache.IRememberedInventory;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;

src/main/java/baritone/command/defaults/ClickCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/ComeCommand.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.GoalBlock;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 

src/main/java/baritone/command/defaults/CommandAlias.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/baritone/command/defaults/DefaultCommands.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
+import baritone.api.command.Command;
 
 import java.util.*;
 

src/main/java/baritone/command/defaults/ExploreCommand.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.GoalXZ;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.RelativeGoalXZ;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.RelativeGoalXZ;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/ExploreFilterCommand.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.RelativeFile;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.RelativeFile;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import com.google.gson.JsonSyntaxException;
 
 import java.io.File;

src/main/java/baritone/command/defaults/FarmCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/FindCommand.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.BlockById;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.BlockById;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import net.minecraft.block.Block;
 
 import java.util.ArrayList;

src/main/java/baritone/command/defaults/FollowCommand.java

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.EntityClassById;
-import baritone.api.utils.command.datatypes.IDatatypeFor;
-import baritone.api.utils.command.datatypes.NearbyPlayer;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.EntityClassById;
+import baritone.api.command.datatypes.IDatatypeFor;
+import baritone.api.command.datatypes.NearbyPlayer;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLiving;

src/main/java/baritone/command/defaults/ForceCancelCommand.java

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.behavior.IPathingBehavior;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/GcCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/GoalCommand.java

@@ -15,18 +15,18 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.process.ICustomGoalProcess;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.RelativeCoordinate;
-import baritone.api.utils.command.datatypes.RelativeGoal;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.RelativeCoordinate;
+import baritone.api.command.datatypes.RelativeGoal;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/HelpCommand.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandNotFoundException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.pagination.Paginator;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandNotFoundException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.pagination.Paginator;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class HelpCommand extends Command {
 

src/main/java/baritone/command/defaults/InvertCommand.java

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalInverted;
 import baritone.api.process.ICustomGoalProcess;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/MineCommand.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.utils.BlockOptionalMeta;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.BlockById;
-import baritone.api.utils.command.datatypes.ForBlockOptionalMeta;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.BlockById;
+import baritone.api.command.datatypes.ForBlockOptionalMeta;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.cache.WorldScanner;
 
 import java.util.ArrayList;

src/main/java/baritone/command/defaults/PathCommand.java

@@ -15,18 +15,18 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.process.ICustomGoalProcess;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.RelativeCoordinate;
-import baritone.api.utils.command.datatypes.RelativeGoal;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.RelativeCoordinate;
+import baritone.api.command.datatypes.RelativeGoal;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 import baritone.cache.WorldScanner;
 
 import java.util.Arrays;

src/main/java/baritone/command/defaults/PauseResumeCommands.java

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.process.IBaritoneProcess;
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/ProcCommand.java

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.calc.IPathingControlManager;
 import baritone.api.process.IBaritoneProcess;
 import baritone.api.process.PathingCommand;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/ReloadAllCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/RenderCommand.java

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/RepackCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 import baritone.cache.WorldScanner;
 
 import java.util.Arrays;

src/main/java/baritone/command/defaults/SaveAllCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/SchematicaCommand.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/SelCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.Baritone;
 import baritone.api.IBaritone;
@@ -28,15 +28,15 @@ import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.ISchematic;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.ForBlockOptionalMeta;
-import baritone.api.utils.command.datatypes.ForEnumFacing;
-import baritone.api.utils.command.datatypes.RelativeBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.ForBlockOptionalMeta;
+import baritone.api.command.datatypes.ForEnumFacing;
+import baritone.api.command.datatypes.RelativeBlockPos;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 import baritone.utils.IRenderer;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.EnumFacing;

src/main/java/baritone/command/defaults/SetCommand.java

@@ -15,18 +15,18 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.Settings;
 import baritone.api.utils.SettingsUtil;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.pagination.Paginator;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.pagination.Paginator;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
@@ -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.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class SetCommand extends Command {
 

src/main/java/baritone/command/defaults/ThisWayCommand.java

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.GoalXZ;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/TunnelCommand.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalStrictDirection;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/VersionCommand.java

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/baritone/command/defaults/WaypointsCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.defaults;
+package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.cache.IWaypoint;
@@ -23,15 +23,15 @@ import baritone.api.cache.Waypoint;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.datatypes.ForWaypoints;
-import baritone.api.utils.command.datatypes.RelativeBlockPos;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidStateException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.helpers.pagination.Paginator;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.ForWaypoints;
+import baritone.api.command.datatypes.RelativeBlockPos;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.helpers.pagination.Paginator;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
@@ -43,7 +43,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class WaypointsCommand extends Command {
 

src/main/java/baritone/command/helpers/arguments/ArgConsumer.java

@@ -15,21 +15,21 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.helpers.arguments;
+package baritone.command.helpers.arguments;
 
 import baritone.api.IBaritone;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.datatypes.IDatatype;
-import baritone.api.utils.command.datatypes.IDatatypeContext;
-import baritone.api.utils.command.datatypes.IDatatypeFor;
-import baritone.api.utils.command.datatypes.IDatatypePost;
-import baritone.api.utils.command.exception.CommandException;
-import baritone.api.utils.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.command.exception.CommandNotEnoughArgumentsException;
-import baritone.api.utils.command.exception.CommandTooManyArgumentsException;
-import baritone.api.utils.command.helpers.arguments.IArgConsumer;
-import baritone.api.utils.command.manager.ICommandManager;
-import baritone.utils.command.argument.CommandArguments;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.datatypes.IDatatype;
+import baritone.api.command.datatypes.IDatatypeContext;
+import baritone.api.command.datatypes.IDatatypeFor;
+import baritone.api.command.datatypes.IDatatypePost;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.exception.CommandNotEnoughArgumentsException;
+import baritone.api.command.exception.CommandTooManyArgumentsException;
+import baritone.api.command.helpers.arguments.IArgConsumer;
+import baritone.api.command.manager.ICommandManager;
+import baritone.command.argument.CommandArguments;
 
 import java.util.ArrayList;
 import java.util.Deque;

src/main/java/baritone/command/manager/CommandManager.java

@@ -15,20 +15,20 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.command.manager;
+package baritone.command.manager;
 
 import baritone.Baritone;
 import baritone.api.IBaritone;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.argument.ICommandArgument;
-import baritone.api.utils.command.exception.CommandUnhandledException;
-import baritone.api.utils.command.exception.ICommandException;
-import baritone.utils.command.helpers.arguments.ArgConsumer;
-import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
-import baritone.api.utils.command.manager.ICommandManager;
-import baritone.api.utils.command.registry.Registry;
-import baritone.utils.command.argument.CommandArguments;
-import baritone.utils.command.defaults.DefaultCommands;
+import baritone.api.command.Command;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandUnhandledException;
+import baritone.api.command.exception.ICommandException;
+import baritone.command.helpers.arguments.ArgConsumer;
+import baritone.api.command.helpers.tabcomplete.TabCompleteHelper;
+import baritone.api.command.manager.ICommandManager;
+import baritone.api.command.registry.Registry;
+import baritone.command.argument.CommandArguments;
+import baritone.command.defaults.DefaultCommands;
 import net.minecraft.util.Tuple;
 
 import java.util.List;

src/main/java/baritone/utils/GuiClick.java

@@ -44,7 +44,7 @@ import java.nio.IntBuffer;
 import java.util.Collections;
 
 import static org.lwjgl.opengl.GL11.*;
-import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 
 public class GuiClick extends GuiScreen {