diff --git a/src/main/java/baritone/command/defaults/DefaultCommands.java b/src/main/java/baritone/command/defaults/DefaultCommands.java
index 21ff52ba..07737aa9 100644
--- a/src/main/java/baritone/command/defaults/DefaultCommands.java
+++ b/src/main/java/baritone/command/defaults/DefaultCommands.java
@@ -19,7 +19,7 @@ package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.command.ICommand;
-import org.hydev.hyritone.TestCommand;
+import org.hydev.hyritone.seedxray.SeedXrayCommand;
 
 import java.util.*;
 
@@ -68,7 +68,7 @@ public final class DefaultCommands {
                 new SelCommand(baritone),
 
                 // Hyritone
-                new TestCommand(baritone)
+                new SeedXrayCommand(baritone)
         ));
         ExecutionControlCommands prc = new ExecutionControlCommands(baritone);
         commands.add(prc.pauseCommand);
diff --git a/src/main/java/baritone/utils/BlockStateInterface.java b/src/main/java/baritone/utils/BlockStateInterface.java
index b7a6a750..434a01c8 100644
--- a/src/main/java/baritone/utils/BlockStateInterface.java
+++ b/src/main/java/baritone/utils/BlockStateInterface.java
@@ -35,7 +35,7 @@ import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.chunk.ChunkStatus;
 import org.hydev.hyritone.Hyritone;
 
-import static org.hydev.hyritone.MiscUtils.posId;
+import static org.hydev.hyritone.util.MiscUtils.posId;
 
 /**
  * Wraps get for chuck caching capability
diff --git a/src/main/java/org/hydev/hyritone/Hyritone.java b/src/main/java/org/hydev/hyritone/Hyritone.java
index 98886679..78dbdf89 100644
--- a/src/main/java/org/hydev/hyritone/Hyritone.java
+++ b/src/main/java/org/hydev/hyritone/Hyritone.java
@@ -18,6 +18,7 @@
 package org.hydev.hyritone;
 
 import baritone.Baritone;
+import org.hydev.hyritone.seedxray.SeedServerCache;
 
 /**
  * TODO: Write a description for this class!
diff --git a/src/main/java/org/hydev/hyritone/SeedServerCache.java b/src/main/java/org/hydev/hyritone/seedxray/SeedServerCache.java
similarity index 97%
rename from src/main/java/org/hydev/hyritone/SeedServerCache.java
rename to src/main/java/org/hydev/hyritone/seedxray/SeedServerCache.java
index 43b6df40..38f47f2f 100644
--- a/src/main/java/org/hydev/hyritone/SeedServerCache.java
+++ b/src/main/java/org/hydev/hyritone/seedxray/SeedServerCache.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.hydev.hyritone;
+package org.hydev.hyritone.seedxray;
 
 import baritone.Baritone;
 import baritone.api.event.events.RenderEvent;
@@ -46,8 +46,8 @@ import java.util.Map;
 import static baritone.api.utils.Helper.mc;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
-import static org.hydev.hyritone.MiscUtils.debug;
-import static org.hydev.hyritone.MiscUtils.posId;
+import static org.hydev.hyritone.util.MiscUtils.debug;
+import static org.hydev.hyritone.util.MiscUtils.posId;
 
 /**
  * TODO: Write a description for this class!
diff --git a/src/main/java/org/hydev/hyritone/TestCommand.java b/src/main/java/org/hydev/hyritone/seedxray/SeedXrayCommand.java
similarity index 93%
rename from src/main/java/org/hydev/hyritone/TestCommand.java
rename to src/main/java/org/hydev/hyritone/seedxray/SeedXrayCommand.java
index a373e4d2..92f8d168 100644
--- a/src/main/java/org/hydev/hyritone/TestCommand.java
+++ b/src/main/java/org/hydev/hyritone/seedxray/SeedXrayCommand.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.hydev.hyritone;
+package org.hydev.hyritone.seedxray;
 
 import baritone.Baritone;
 import baritone.api.IBaritone;
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.stream.Stream;
 
 import static org.hydev.hyritone.Hyritone.seedServerCache;
-import static org.hydev.hyritone.MiscUtils.print;
+import static org.hydev.hyritone.util.MiscUtils.print;
 
 /**
  * TODO: Write a description for this class!
@@ -42,9 +42,9 @@ import static org.hydev.hyritone.MiscUtils.print;
  * @author Vanilla (https://github.com/VergeDX)
  * @since 2020-02-19 12:29
  */
-public class TestCommand extends Command
+public class SeedXrayCommand extends Command
 {
-    public TestCommand(IBaritone baritone) {
+    public SeedXrayCommand(IBaritone baritone) {
         super(baritone, "seedxray");
     }
 
diff --git a/src/main/java/org/hydev/hyritone/MiscUtils.java b/src/main/java/org/hydev/hyritone/util/MiscUtils.java
similarity index 98%
rename from src/main/java/org/hydev/hyritone/MiscUtils.java
rename to src/main/java/org/hydev/hyritone/util/MiscUtils.java
index 5901abbe..9a336f55 100644
--- a/src/main/java/org/hydev/hyritone/MiscUtils.java
+++ b/src/main/java/org/hydev/hyritone/util/MiscUtils.java
@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.hydev.hyritone;
+package org.hydev.hyritone.util;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.StringTextComponent;