diff --git a/common/src/main/java/com/dfsek/terra/commands/CommandUtil.java b/common/src/main/java/com/dfsek/terra/commands/CommandUtil.java
index 75ea0fa03..3d2e3423a 100644
--- a/common/src/main/java/com/dfsek/terra/commands/CommandUtil.java
+++ b/common/src/main/java/com/dfsek/terra/commands/CommandUtil.java
@@ -2,7 +2,9 @@ package com.dfsek.terra.commands;
 
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
+import com.dfsek.terra.commands.biome.BiomeCommand;
 import com.dfsek.terra.commands.profiler.ProfileCommand;
+import com.dfsek.terra.commands.structure.StructureCommand;
 
 public final class CommandUtil {
     public static void registerAll(CommandManager manager) throws MalformedCommandException {
diff --git a/common/src/main/java/com/dfsek/terra/commands/GeometryCommand.java b/common/src/main/java/com/dfsek/terra/commands/GeometryCommand.java
new file mode 100644
index 000000000..574c1d2b7
--- /dev/null
+++ b/common/src/main/java/com/dfsek/terra/commands/GeometryCommand.java
@@ -0,0 +1,12 @@
+package com.dfsek.terra.commands;
+
+import com.dfsek.terra.api.command.CommandTemplate;
+import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.config.lang.LangUtil;
+
+public class GeometryCommand implements CommandTemplate {
+    @Override
+    public void execute(CommandSender sender) {
+        LangUtil.send("command.geometry.main-menu", sender);
+    }
+}
diff --git a/common/src/main/java/com/dfsek/terra/commands/BiomeCommand.java b/common/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java
similarity index 91%
rename from common/src/main/java/com/dfsek/terra/commands/BiomeCommand.java
rename to common/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java
index 1c813f3ab..8871f736c 100644
--- a/common/src/main/java/com/dfsek/terra/commands/BiomeCommand.java
+++ b/common/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.commands;
+package com.dfsek.terra.commands.biome;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
@@ -11,8 +11,6 @@ import com.dfsek.terra.api.platform.CommandSender;
 import com.dfsek.terra.api.platform.entity.Player;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
-import com.dfsek.terra.commands.biome.BiomeInfoCommand;
-import com.dfsek.terra.commands.biome.BiomeLocateCommand;
 import com.dfsek.terra.config.lang.LangUtil;
 
 @Command(
diff --git a/common/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java b/common/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java
index 4caad6957..c81164363 100644
--- a/common/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java
+++ b/common/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java
@@ -7,6 +7,7 @@ import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.config.lang.LangUtil;
 
 @Command(
         subcommands = {
@@ -23,6 +24,6 @@ import com.dfsek.terra.api.platform.CommandSender;
 public class ProfileCommand implements CommandTemplate {
     @Override
     public void execute(CommandSender sender) {
-
+        LangUtil.send("command.profile.main-menu", sender);
     }
 }
diff --git a/common/src/main/java/com/dfsek/terra/commands/StructureCommand.java b/common/src/main/java/com/dfsek/terra/commands/structure/StructureCommand.java
similarity index 81%
rename from common/src/main/java/com/dfsek/terra/commands/StructureCommand.java
rename to common/src/main/java/com/dfsek/terra/commands/structure/StructureCommand.java
index 63c191ea5..c12f021d2 100644
--- a/common/src/main/java/com/dfsek/terra/commands/StructureCommand.java
+++ b/common/src/main/java/com/dfsek/terra/commands/structure/StructureCommand.java
@@ -1,12 +1,10 @@
-package com.dfsek.terra.commands;
+package com.dfsek.terra.commands.structure;
 
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.Subcommand;
 import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.commands.structure.SpawnCommand;
-import com.dfsek.terra.commands.structure.StructureExportCommand;
-import com.dfsek.terra.commands.structure.StructureLoadCommand;
+import com.dfsek.terra.config.lang.LangUtil;
 
 @Command(
         subcommands = {
@@ -31,6 +29,6 @@ import com.dfsek.terra.commands.structure.StructureLoadCommand;
 public class StructureCommand implements CommandTemplate {
     @Override
     public void execute(CommandSender sender) {
-
+        LangUtil.send("command.structure.main-menu", sender);
     }
 }