diff --git a/src/main/java/com/dfsek/terra/command/BiomeCommand.java b/src/main/java/com/dfsek/terra/command/BiomeCommand.java
index 7e67f1cd6..fe3e4eee9 100644
--- a/src/main/java/com/dfsek/terra/command/BiomeCommand.java
+++ b/src/main/java/com/dfsek/terra/command/BiomeCommand.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.command;
 
 import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.command.type.PlayerCommand;
 import com.dfsek.terra.config.genconfig.BiomeConfig;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -30,7 +31,7 @@ public class BiomeCommand extends PlayerCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/OreCommand.java b/src/main/java/com/dfsek/terra/command/OreCommand.java
index b7910c486..00495a496 100644
--- a/src/main/java/com/dfsek/terra/command/OreCommand.java
+++ b/src/main/java/com/dfsek/terra/command/OreCommand.java
@@ -1,5 +1,6 @@
 package com.dfsek.terra.command;
 
+import com.dfsek.terra.command.type.PlayerCommand;
 import com.dfsek.terra.config.genconfig.OreConfig;
 import org.bukkit.block.Block;
 import org.bukkit.command.Command;
@@ -33,7 +34,7 @@ public class OreCommand extends PlayerCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/ReloadCommand.java b/src/main/java/com/dfsek/terra/command/ReloadCommand.java
index 551106435..54963a014 100644
--- a/src/main/java/com/dfsek/terra/command/ReloadCommand.java
+++ b/src/main/java/com/dfsek/terra/command/ReloadCommand.java
@@ -1,6 +1,7 @@
 package com.dfsek.terra.command;
 
 import com.dfsek.terra.Terra;
+import com.dfsek.terra.command.type.Command;
 import com.dfsek.terra.config.ConfigUtil;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/com/dfsek/terra/command/SaveDataCommand.java b/src/main/java/com/dfsek/terra/command/SaveDataCommand.java
index 1a640a5d5..1f9f756fb 100644
--- a/src/main/java/com/dfsek/terra/command/SaveDataCommand.java
+++ b/src/main/java/com/dfsek/terra/command/SaveDataCommand.java
@@ -1,5 +1,6 @@
 package com.dfsek.terra.command;
 
+import com.dfsek.terra.command.type.Command;
 import com.dfsek.terra.generation.TerraChunkGenerator;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/com/dfsek/terra/command/TerraCommand.java b/src/main/java/com/dfsek/terra/command/TerraCommand.java
index c677de501..e45a28f95 100644
--- a/src/main/java/com/dfsek/terra/command/TerraCommand.java
+++ b/src/main/java/com/dfsek/terra/command/TerraCommand.java
@@ -5,20 +5,18 @@ import com.dfsek.terra.command.profile.ProfileCommand;
 import com.dfsek.terra.command.structure.StructureCommand;
 import com.dfsek.terra.config.genconfig.BiomeConfig;
 import com.dfsek.terra.config.genconfig.OreConfig;
-import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 public class TerraCommand implements CommandExecutor, TabExecutor {
-    private final List<com.dfsek.terra.command.Command> commands = Arrays.asList(new ReloadCommand(),
+    private final List<com.dfsek.terra.command.type.Command> commands = Arrays.asList(new ReloadCommand(),
             new BiomeCommand(),
             new OreCommand(),
             new ProfileCommand(),
@@ -29,7 +27,7 @@ public class TerraCommand implements CommandExecutor, TabExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
         if(args.length > 0) {
-            for(com.dfsek.terra.command.Command c : commands) {
+            for(com.dfsek.terra.command.type.Command c : commands) {
                 if(c.getName().equals(args[0])) return c.execute(sender, command, label, Arrays.stream(args, 1, args.length).toArray(String[]::new));
             }
             sender.sendMessage("Invalid command.");
diff --git a/src/main/java/com/dfsek/terra/command/image/ImageCommand.java b/src/main/java/com/dfsek/terra/command/image/ImageCommand.java
index 78e9bba6f..2078da80b 100644
--- a/src/main/java/com/dfsek/terra/command/image/ImageCommand.java
+++ b/src/main/java/com/dfsek/terra/command/image/ImageCommand.java
@@ -1,19 +1,13 @@
 package com.dfsek.terra.command.image;
 
-import com.dfsek.terra.Terra;
-import com.dfsek.terra.command.PlayerCommand;
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import com.dfsek.terra.command.image.gui.GUICommand;
-import com.dfsek.terra.config.WorldConfig;
-import com.dfsek.terra.image.WorldImageGenerator;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 public class ImageCommand extends WorldCommand {
@@ -26,7 +20,7 @@ public class ImageCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Arrays.asList(new RenderCommand(), new GUICommand());
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/image/RenderCommand.java b/src/main/java/com/dfsek/terra/command/image/RenderCommand.java
index d196abe37..87b981b96 100644
--- a/src/main/java/com/dfsek/terra/command/image/RenderCommand.java
+++ b/src/main/java/com/dfsek/terra/command/image/RenderCommand.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.command.image;
 
 import com.dfsek.terra.Terra;
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import com.dfsek.terra.image.WorldImageGenerator;
 import org.bukkit.World;
 import org.bukkit.command.Command;
@@ -37,7 +37,7 @@ public class RenderCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/image/gui/GUICommand.java b/src/main/java/com/dfsek/terra/command/image/gui/GUICommand.java
index bc1fd69ff..e544dccad 100644
--- a/src/main/java/com/dfsek/terra/command/image/gui/GUICommand.java
+++ b/src/main/java/com/dfsek/terra/command/image/gui/GUICommand.java
@@ -1,7 +1,6 @@
 package com.dfsek.terra.command.image.gui;
 
-import com.dfsek.terra.command.WorldCommand;
-import com.dfsek.terra.config.WorldConfig;
+import com.dfsek.terra.command.type.WorldCommand;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -25,7 +24,7 @@ public class GUICommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Arrays.asList(new StepGUICommand(), new RawGUICommand());
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/image/gui/RawGUICommand.java b/src/main/java/com/dfsek/terra/command/image/gui/RawGUICommand.java
index 5682308fe..3081c85d5 100644
--- a/src/main/java/com/dfsek/terra/command/image/gui/RawGUICommand.java
+++ b/src/main/java/com/dfsek/terra/command/image/gui/RawGUICommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.command.image.gui;
 
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import com.dfsek.terra.config.ConfigUtil;
 import com.dfsek.terra.config.WorldConfig;
 import com.dfsek.terra.image.ImageLoader;
@@ -31,7 +31,7 @@ public class RawGUICommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/image/gui/StepGUICommand.java b/src/main/java/com/dfsek/terra/command/image/gui/StepGUICommand.java
index 56b55f580..661855a04 100644
--- a/src/main/java/com/dfsek/terra/command/image/gui/StepGUICommand.java
+++ b/src/main/java/com/dfsek/terra/command/image/gui/StepGUICommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.command.image.gui;
 
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import com.dfsek.terra.config.ConfigUtil;
 import com.dfsek.terra.config.WorldConfig;
 import com.dfsek.terra.image.ImageLoader;
@@ -31,7 +31,7 @@ public class StepGUICommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/profile/ProfileCommand.java b/src/main/java/com/dfsek/terra/command/profile/ProfileCommand.java
index 851a3ad70..6bf4c0563 100644
--- a/src/main/java/com/dfsek/terra/command/profile/ProfileCommand.java
+++ b/src/main/java/com/dfsek/terra/command/profile/ProfileCommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.command.profile;
 
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@ public class ProfileCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Arrays.asList(new QueryCommand(), new ResetCommand(), new StartCommand(), new StopCommand());
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java b/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java
index e28fe0622..8ba0e5216 100644
--- a/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java
+++ b/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java
@@ -1,8 +1,7 @@
 package com.dfsek.terra.command.profile;
 
 import com.dfsek.terra.TerraProfiler;
-import com.dfsek.terra.command.PlayerCommand;
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -26,7 +25,7 @@ public class QueryCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java b/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java
index 4a8bd5a31..741955863 100644
--- a/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java
+++ b/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.command.profile;
 
 import com.dfsek.terra.TerraProfiler;
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@ public class ResetCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/profile/StartCommand.java b/src/main/java/com/dfsek/terra/command/profile/StartCommand.java
index d60f9b5b8..1491d5fd6 100644
--- a/src/main/java/com/dfsek/terra/command/profile/StartCommand.java
+++ b/src/main/java/com/dfsek/terra/command/profile/StartCommand.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.command.profile;
 
 import com.dfsek.terra.TerraProfiler;
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@ public class StartCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/profile/StopCommand.java b/src/main/java/com/dfsek/terra/command/profile/StopCommand.java
index a143896e2..e54191305 100644
--- a/src/main/java/com/dfsek/terra/command/profile/StopCommand.java
+++ b/src/main/java/com/dfsek/terra/command/profile/StopCommand.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.command.profile;
 
 import com.dfsek.terra.TerraProfiler;
-import com.dfsek.terra.command.WorldCommand;
+import com.dfsek.terra.command.type.WorldCommand;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@ public class StopCommand extends WorldCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/structure/ExportCommand.java b/src/main/java/com/dfsek/terra/command/structure/ExportCommand.java
index 2e822c054..2abd31a05 100644
--- a/src/main/java/com/dfsek/terra/command/structure/ExportCommand.java
+++ b/src/main/java/com/dfsek/terra/command/structure/ExportCommand.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.command.structure;
 
 import com.dfsek.terra.Terra;
 import com.dfsek.terra.WorldEditUtil;
-import com.dfsek.terra.command.PlayerCommand;
+import com.dfsek.terra.command.type.PlayerCommand;
 import com.dfsek.terra.structure.GaeaStructure;
 import com.dfsek.terra.structure.InitializationException;
 import com.sk89q.worldedit.IncompleteRegionException;
@@ -69,7 +69,7 @@ public class ExportCommand extends PlayerCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/structure/LoadCommand.java b/src/main/java/com/dfsek/terra/command/structure/LoadCommand.java
index 1bbb93800..1fdc9dcac 100644
--- a/src/main/java/com/dfsek/terra/command/structure/LoadCommand.java
+++ b/src/main/java/com/dfsek/terra/command/structure/LoadCommand.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.command.structure;
 
 import com.dfsek.terra.Terra;
-import com.dfsek.terra.command.PlayerCommand;
+import com.dfsek.terra.command.type.PlayerCommand;
 import com.dfsek.terra.structure.GaeaStructure;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -33,7 +33,7 @@ public class LoadCommand extends PlayerCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/structure/StructureCommand.java b/src/main/java/com/dfsek/terra/command/structure/StructureCommand.java
index 57333bfa7..ec3140e04 100644
--- a/src/main/java/com/dfsek/terra/command/structure/StructureCommand.java
+++ b/src/main/java/com/dfsek/terra/command/structure/StructureCommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.command.structure;
 
-import com.dfsek.terra.command.PlayerCommand;
+import com.dfsek.terra.command.type.PlayerCommand;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -18,7 +18,7 @@ public class StructureCommand extends PlayerCommand {
     }
 
     @Override
-    public List<com.dfsek.terra.command.Command> getSubCommands() {
+    public List<com.dfsek.terra.command.type.Command> getSubCommands() {
         return Arrays.asList(new ExportCommand(), new LoadCommand());
     }
 
diff --git a/src/main/java/com/dfsek/terra/command/Command.java b/src/main/java/com/dfsek/terra/command/type/Command.java
similarity index 91%
rename from src/main/java/com/dfsek/terra/command/Command.java
rename to src/main/java/com/dfsek/terra/command/type/Command.java
index 1981aa159..bb5889d32 100644
--- a/src/main/java/com/dfsek/terra/command/Command.java
+++ b/src/main/java/com/dfsek/terra/command/type/Command.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.command;
+package com.dfsek.terra.command.type;
 
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -13,7 +13,7 @@ public abstract class Command {
     public abstract int arguments();
     public final boolean execute(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command command, @NotNull String label, @NotNull String[] args) {
         if(args.length > 0) {
-            for(com.dfsek.terra.command.Command c : getSubCommands()) {
+            for(Command c : getSubCommands()) {
                 if(c.getName().equals(args[0])) return c.execute(sender, command, label, Arrays.stream(args, 1, args.length).toArray(String[]::new));
             }
             if(args.length != arguments()) {
diff --git a/src/main/java/com/dfsek/terra/command/PlayerCommand.java b/src/main/java/com/dfsek/terra/command/type/PlayerCommand.java
similarity index 95%
rename from src/main/java/com/dfsek/terra/command/PlayerCommand.java
rename to src/main/java/com/dfsek/terra/command/type/PlayerCommand.java
index 239fb95a2..d84aff6cd 100644
--- a/src/main/java/com/dfsek/terra/command/PlayerCommand.java
+++ b/src/main/java/com/dfsek/terra/command/type/PlayerCommand.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.command;
+package com.dfsek.terra.command.type;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/dfsek/terra/command/WorldCommand.java b/src/main/java/com/dfsek/terra/command/type/WorldCommand.java
similarity index 95%
rename from src/main/java/com/dfsek/terra/command/WorldCommand.java
rename to src/main/java/com/dfsek/terra/command/type/WorldCommand.java
index 369637752..7a983588a 100644
--- a/src/main/java/com/dfsek/terra/command/WorldCommand.java
+++ b/src/main/java/com/dfsek/terra/command/type/WorldCommand.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.command;
+package com.dfsek.terra.command.type;
 
 import com.dfsek.terra.generation.TerraChunkGenerator;
 import org.bukkit.World;