diff --git a/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java b/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java
index c3f5d0eb..a11ea444 100644
--- a/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java
+++ b/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java
@@ -29,7 +29,7 @@
 import cloud.commandframework.arguments.suggestion.SuggestionFactory;
 import cloud.commandframework.brigadier.BrigadierManagerHolder;
 import cloud.commandframework.brigadier.CloudBrigadierManager;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.brigadier.suggestion.TooltipSuggestion;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.ArgumentParseException;
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/internal/ModdedParserMappings.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/internal/ModdedParserMappings.java
index 033f9956..d57aa6b9 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/internal/ModdedParserMappings.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/internal/ModdedParserMappings.java
@@ -27,7 +27,7 @@
 import cloud.commandframework.arguments.parser.ParserParameters;
 import cloud.commandframework.arguments.standard.UUIDParser;
 import cloud.commandframework.brigadier.CloudBrigadierManager;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.minecraft.modded.ModdedParserParameters;
 import cloud.commandframework.minecraft.modded.annotation.specifier.Center;
 import cloud.commandframework.minecraft.modded.data.Coordinates;
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AngleParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AngleParser.java
index 5dbcd189..126442d7 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AngleParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AngleParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.commands.arguments.AngleArgument.SingleAngle;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AxisParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AxisParser.java
index e2b1aab7..2e3b781f 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AxisParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/AxisParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import io.leangen.geantyref.TypeToken;
 import java.util.EnumSet;
 import net.minecraft.commands.arguments.coordinates.SwizzleArgument;
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/CompoundTagParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/CompoundTagParser.java
index 7463f711..a41a0010 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/CompoundTagParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/CompoundTagParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.nbt.CompoundTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/EntityAnchorParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/EntityAnchorParser.java
index 2fc7cbfd..c1d54df8 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/EntityAnchorParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/EntityAnchorParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.commands.arguments.EntityAnchorArgument.Anchor;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/FloatRangeParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/FloatRangeParser.java
index cef71321..1c35773a 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/FloatRangeParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/FloatRangeParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.commands.arguments.RangeArgument;
 import org.checkerframework.checker.nullness.qual.NonNull;
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/IntRangeParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/IntRangeParser.java
index cc93aee7..d0b9f669 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/IntRangeParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/IntRangeParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.commands.arguments.RangeArgument;
 import org.checkerframework.checker.nullness.qual.NonNull;
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NamedColorParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NamedColorParser.java
index 8c01da4c..1e2238a8 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NamedColorParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NamedColorParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.ChatFormatting;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtPathParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtPathParser.java
index 36e54918..70ce2c97 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtPathParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtPathParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.commands.arguments.NbtPathArgument.NbtPath;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtTagParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtTagParser.java
index 9f5954a0..f59f8add 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtTagParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/NbtTagParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.nbt.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ObjectiveCriteriaParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ObjectiveCriteriaParser.java
index 8b2dcc7e..8f9ad1dd 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ObjectiveCriteriaParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ObjectiveCriteriaParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.world.scores.criteria.ObjectiveCriteria;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ResourceLocationArgument.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ResourceLocationArgument.java
index 51f95a1b..377f9e45 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ResourceLocationArgument.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ResourceLocationArgument.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.resources.ResourceLocation;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ScoreboardOperationParser.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ScoreboardOperationParser.java
index 15c731cb..c803dc2d 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ScoreboardOperationParser.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/ScoreboardOperationParser.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import net.minecraft.commands.arguments.OperationArgument;
 import net.minecraft.commands.arguments.OperationArgument.Operation;
 import org.checkerframework.checker.nullness.qual.NonNull;
diff --git a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/VanillaArgumentParsers.java b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/VanillaArgumentParsers.java
index d1c10208..54bb6b09 100644
--- a/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/VanillaArgumentParsers.java
+++ b/cloud-minecraft-modded-common/src/main/java/cloud/commandframework/minecraft/modded/parser/VanillaArgumentParsers.java
@@ -26,7 +26,7 @@
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.minecraft.modded.ModdedCommandContextKeys;
 import cloud.commandframework.minecraft.modded.data.Coordinates;