diff --git a/src/comms/java/comms/BufferedConnection.java b/src/comms/java/cabaletta/comms/BufferedConnection.java
similarity index 99%
rename from src/comms/java/comms/BufferedConnection.java
rename to src/comms/java/cabaletta/comms/BufferedConnection.java
index 450010e7..b5ff35c9 100644
--- a/src/comms/java/comms/BufferedConnection.java
+++ b/src/comms/java/cabaletta/comms/BufferedConnection.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/comms/java/comms/ConstructingDeserializer.java b/src/comms/java/cabaletta/comms/ConstructingDeserializer.java
similarity index 98%
rename from src/comms/java/comms/ConstructingDeserializer.java
rename to src/comms/java/cabaletta/comms/ConstructingDeserializer.java
index 5b49ecdb..eb15bdf0 100644
--- a/src/comms/java/comms/ConstructingDeserializer.java
+++ b/src/comms/java/cabaletta/comms/ConstructingDeserializer.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/comms/java/comms/IConnection.java b/src/comms/java/cabaletta/comms/IConnection.java
similarity index 97%
rename from src/comms/java/comms/IConnection.java
rename to src/comms/java/cabaletta/comms/IConnection.java
index dc54beb0..02046fe3 100644
--- a/src/comms/java/comms/IConnection.java
+++ b/src/comms/java/cabaletta/comms/IConnection.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.IOException;
 
diff --git a/src/comms/java/comms/IMessageListener.java b/src/comms/java/cabaletta/comms/IMessageListener.java
similarity index 85%
rename from src/comms/java/comms/IMessageListener.java
rename to src/comms/java/cabaletta/comms/IMessageListener.java
index 94300f1f..2829f267 100644
--- a/src/comms/java/comms/IMessageListener.java
+++ b/src/comms/java/cabaletta/comms/IMessageListener.java
@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
-import comms.downward.MessageChat;
-import comms.downward.MessageComputationRequest;
-import comms.upward.MessageComputationResponse;
-import comms.upward.MessageStatus;
+import cabaletta.comms.downward.MessageChat;
+import cabaletta.comms.downward.MessageComputationRequest;
+import cabaletta.comms.upward.MessageComputationResponse;
+import cabaletta.comms.upward.MessageStatus;
 
 public interface IMessageListener {
     default void handle(MessageStatus message) {
diff --git a/src/comms/java/comms/MessageDeserializer.java b/src/comms/java/cabaletta/comms/MessageDeserializer.java
similarity index 97%
rename from src/comms/java/comms/MessageDeserializer.java
rename to src/comms/java/cabaletta/comms/MessageDeserializer.java
index aece828d..264a753d 100644
--- a/src/comms/java/comms/MessageDeserializer.java
+++ b/src/comms/java/cabaletta/comms/MessageDeserializer.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/comms/java/comms/Pipe.java b/src/comms/java/cabaletta/comms/Pipe.java
similarity index 99%
rename from src/comms/java/comms/Pipe.java
rename to src/comms/java/cabaletta/comms/Pipe.java
index c189af60..42e28899 100644
--- a/src/comms/java/comms/Pipe.java
+++ b/src/comms/java/cabaletta/comms/Pipe.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/comms/java/comms/SerializedConnection.java b/src/comms/java/cabaletta/comms/SerializedConnection.java
similarity index 98%
rename from src/comms/java/comms/SerializedConnection.java
rename to src/comms/java/cabaletta/comms/SerializedConnection.java
index c4191194..5ac482a9 100644
--- a/src/comms/java/comms/SerializedConnection.java
+++ b/src/comms/java/cabaletta/comms/SerializedConnection.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.*;
 
diff --git a/src/comms/java/comms/SocketConnection.java b/src/comms/java/cabaletta/comms/SocketConnection.java
similarity index 97%
rename from src/comms/java/comms/SocketConnection.java
rename to src/comms/java/cabaletta/comms/SocketConnection.java
index e40d5a1a..95bb83d5 100644
--- a/src/comms/java/comms/SocketConnection.java
+++ b/src/comms/java/cabaletta/comms/SocketConnection.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.IOException;
 import java.net.Socket;
diff --git a/src/comms/java/comms/downward/MessageChat.java b/src/comms/java/cabaletta/comms/downward/MessageChat.java
similarity index 92%
rename from src/comms/java/comms/downward/MessageChat.java
rename to src/comms/java/cabaletta/comms/downward/MessageChat.java
index b04d2a31..be6b0f3b 100644
--- a/src/comms/java/comms/downward/MessageChat.java
+++ b/src/comms/java/cabaletta/comms/downward/MessageChat.java
@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms.downward;
+package cabaletta.comms.downward;
 
-import comms.IMessageListener;
-import comms.iMessage;
+import cabaletta.comms.IMessageListener;
+import cabaletta.comms.iMessage;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/comms/java/comms/downward/MessageComputationRequest.java b/src/comms/java/cabaletta/comms/downward/MessageComputationRequest.java
similarity index 94%
rename from src/comms/java/comms/downward/MessageComputationRequest.java
rename to src/comms/java/cabaletta/comms/downward/MessageComputationRequest.java
index 065c27a2..c1e4f51a 100644
--- a/src/comms/java/comms/downward/MessageComputationRequest.java
+++ b/src/comms/java/cabaletta/comms/downward/MessageComputationRequest.java
@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms.downward;
+package cabaletta.comms.downward;
 
-import comms.IMessageListener;
-import comms.iMessage;
+import cabaletta.comms.IMessageListener;
+import cabaletta.comms.iMessage;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/comms/java/comms/iMessage.java b/src/comms/java/cabaletta/comms/iMessage.java
similarity index 98%
rename from src/comms/java/comms/iMessage.java
rename to src/comms/java/cabaletta/comms/iMessage.java
index 67ec2965..7d00ab4c 100644
--- a/src/comms/java/comms/iMessage.java
+++ b/src/comms/java/cabaletta/comms/iMessage.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms;
+package cabaletta.comms;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/comms/java/comms/upward/MessageComputationResponse.java b/src/comms/java/cabaletta/comms/upward/MessageComputationResponse.java
similarity index 95%
rename from src/comms/java/comms/upward/MessageComputationResponse.java
rename to src/comms/java/cabaletta/comms/upward/MessageComputationResponse.java
index 60118979..a6d7ac1b 100644
--- a/src/comms/java/comms/upward/MessageComputationResponse.java
+++ b/src/comms/java/cabaletta/comms/upward/MessageComputationResponse.java
@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms.upward;
+package cabaletta.comms.upward;
 
-import comms.IMessageListener;
-import comms.iMessage;
+import cabaletta.comms.IMessageListener;
+import cabaletta.comms.iMessage;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/comms/java/comms/upward/MessageStatus.java b/src/comms/java/cabaletta/comms/upward/MessageStatus.java
similarity index 97%
rename from src/comms/java/comms/upward/MessageStatus.java
rename to src/comms/java/cabaletta/comms/upward/MessageStatus.java
index 53786a01..f7727fc1 100644
--- a/src/comms/java/comms/upward/MessageStatus.java
+++ b/src/comms/java/cabaletta/comms/upward/MessageStatus.java
@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package comms.upward;
+package cabaletta.comms.upward;
 
-import comms.IMessageListener;
-import comms.iMessage;
+import cabaletta.comms.IMessageListener;
+import cabaletta.comms.iMessage;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/baritone/behavior/ControllerBehavior.java b/src/main/java/baritone/behavior/ControllerBehavior.java
index a0783272..9827bb66 100644
--- a/src/main/java/baritone/behavior/ControllerBehavior.java
+++ b/src/main/java/baritone/behavior/ControllerBehavior.java
@@ -27,14 +27,14 @@ import baritone.api.utils.BetterBlockPos;
 import baritone.pathing.movement.CalculationContext;
 import baritone.utils.Helper;
 import baritone.utils.pathing.SegmentedCalculator;
-import comms.BufferedConnection;
-import comms.IConnection;
-import comms.IMessageListener;
-import comms.downward.MessageChat;
-import comms.downward.MessageComputationRequest;
-import comms.iMessage;
-import comms.upward.MessageComputationResponse;
-import comms.upward.MessageStatus;
+import cabaletta.comms.BufferedConnection;
+import cabaletta.comms.IConnection;
+import cabaletta.comms.IMessageListener;
+import cabaletta.comms.downward.MessageChat;
+import cabaletta.comms.downward.MessageComputationRequest;
+import cabaletta.comms.iMessage;
+import cabaletta.comms.upward.MessageComputationResponse;
+import cabaletta.comms.upward.MessageStatus;
 import net.minecraft.util.math.BlockPos;
 
 import java.io.IOException;
diff --git a/src/main/java/baritone/utils/ExampleBaritoneControl.java b/src/main/java/baritone/utils/ExampleBaritoneControl.java
index 36d031c2..1291f8e1 100644
--- a/src/main/java/baritone/utils/ExampleBaritoneControl.java
+++ b/src/main/java/baritone/utils/ExampleBaritoneControl.java
@@ -32,7 +32,7 @@ import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.Moves;
 import baritone.process.CustomGoalProcess;
-import comms.SocketConnection;
+import cabaletta.comms.SocketConnection;
 import net.minecraft.block.Block;
 import net.minecraft.client.multiplayer.ChunkProviderClient;
 import net.minecraft.entity.Entity;