diff --git a/src/main/java/modtweaker/Commands.java b/src/main/java/modtweaker/Commands.java
new file mode 100644
index 0000000..c0f3681
--- /dev/null
+++ b/src/main/java/modtweaker/Commands.java
@@ -0,0 +1,59 @@
+package modtweaker;
+
+import minetweaker.MineTweakerAPI;
+import minetweaker.api.player.IPlayer;
+import minetweaker.api.server.ICommandFunction;
+import modtweaker.commands.EntityMappingLogger;
+import modtweaker.mods.botania.commands.BotaniaBrewLogger;
+import modtweaker.mods.botania.lexicon.commands.LexiconCategoryLogger;
+import modtweaker.mods.botania.lexicon.commands.LexiconEntryLogger;
+import modtweaker.mods.botania.lexicon.commands.LexiconKnowledgeTypesLogger;
+import modtweaker.mods.botania.lexicon.commands.LexiconPageLogger;
+import modtweaker.mods.chisel.commands.ChiselGroupLogger;
+import modtweaker.mods.chisel.commands.ChiselVariationLogger;
+import modtweaker.mods.mekanism.gas.GasLogger;
+import modtweaker.mods.tconstruct.MaterialLogger;
+import modtweaker.mods.thaumcraft.commands.AspectLogger;
+import modtweaker.mods.thaumcraft.research.commands.ResearchLogger;
+import modtweaker.util.TweakerPlugin;
+
+public class Commands {
+	public static void registerCommands() {
+		MineTweakerAPI.server.addMineTweakerCommand("tooltips", new String[] { "/minetweaker tooltips", "    Adds tooltips to all items ingame with their mt script name, press ctrl on an item to print to the log" }, new ICommandFunction() {
+			@Override
+			public void execute(String[] arguments, IPlayer player) {
+				ClientEvents.active = !ClientEvents.active;
+			}
+		});
+
+		MineTweakerAPI.server.addMineTweakerCommand("entities", new String[] { "/minetweaker entities", "    Outputs a list of entities class mapping keys" }, new EntityMappingLogger());
+
+		if (TweakerPlugin.isLoaded("Mekanism")) {
+			MineTweakerAPI.server.addMineTweakerCommand("gases", new String[] { "/minetweaker gases", "    Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger());
+		}
+
+		if (TweakerPlugin.isLoaded("Thaumcraft")) {
+			MineTweakerAPI.server.addMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", "    Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", "    Outputs a list of all aspects registered to entities and items"}, new AspectLogger());
+		}
+
+		if (TweakerPlugin.isLoaded("TConstruct")) {
+			MineTweakerAPI.server.addMineTweakerCommand("materials", new String[] { "/minetweaker materials", "    Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger());
+		}
+
+		if (TweakerPlugin.isLoaded("Botania")) {
+			MineTweakerAPI.server.addMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", "    Outputs a list of lexicon categories" }, new LexiconCategoryLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("lexiconEntries", new String[] { "/minetweaker lexiconEntries", "/minetweaker lexiconEntries [CATEGORY]", "    Outputs a list of lexicon entries" }, new LexiconEntryLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", "    Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", "    Outputs a list of keys for botania brews" }, new BotaniaBrewLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", "    Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger());
+		}
+
+
+		if (TweakerPlugin.isLoaded("chisel")) {
+			MineTweakerAPI.server.addMineTweakerCommand("chiselGroups", new String[] { "/minetweaker chiselGroups", "    Outputs a list of chisel groups" }, new ChiselGroupLogger());
+			MineTweakerAPI.server.addMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", "    Outputs a list of chisel variations" }, new ChiselVariationLogger());
+		}
+
+	}
+}
diff --git a/src/main/java/modtweaker/ModTweaker.java b/src/main/java/modtweaker/ModTweaker.java
index c16d523..61ae714 100644
--- a/src/main/java/modtweaker/ModTweaker.java
+++ b/src/main/java/modtweaker/ModTweaker.java
@@ -87,41 +87,6 @@ public class ModTweaker {
 
 	@EventHandler
 	public void onServerStart(FMLServerStartingEvent event) {
-		MineTweakerAPI.server.addMineTweakerCommand("tooltips", new String[] { "/minetweaker tooltips", "    Adds tooltips to all items ingame with their mt script name, press ctrl on an item to print to the log" }, new ICommandFunction() {
-			@Override
-			public void execute(String[] arguments, IPlayer player) {
-				ClientEvents.active = !ClientEvents.active;
-			}
-		});
-
-		MineTweakerAPI.server.addMineTweakerCommand("entities", new String[] { "/minetweaker entities", "    Outputs a list of entities class mapping keys" }, new EntityMappingLogger());
-
-		if (TweakerPlugin.isLoaded("Mekanism")) {
-			MineTweakerAPI.server.addMineTweakerCommand("gases", new String[] { "/minetweaker gases", "    Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger());
-		}
-
-		if (TweakerPlugin.isLoaded("Thaumcraft")) {
-			MineTweakerAPI.server.addMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", "    Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", "    Outputs a list of all aspects registered to entities and items"}, new AspectLogger());
-		}
-
-		if (TweakerPlugin.isLoaded("TConstruct")) {
-			MineTweakerAPI.server.addMineTweakerCommand("materials", new String[] { "/minetweaker materials", "    Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger());
-		}
-
-		if (TweakerPlugin.isLoaded("Botania")) {
-			MineTweakerAPI.server.addMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", "    Outputs a list of lexicon categories" }, new LexiconCategoryLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("lexiconEntries", new String[] { "/minetweaker lexiconEntries", "/minetweaker lexiconEntries [CATEGORY]", "    Outputs a list of lexicon entries" }, new LexiconEntryLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", "    Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", "    Outputs a list of keys for botania brews" }, new BotaniaBrewLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", "    Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger());
-		}
-
-
-		if (TweakerPlugin.isLoaded("chisel")) {
-			MineTweakerAPI.server.addMineTweakerCommand("chiselGroups", new String[] { "/minetweaker chiselGroups", "    Outputs a list of chisel groups" }, new ChiselGroupLogger());
-			MineTweakerAPI.server.addMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", "    Outputs a list of chisel variations" }, new ChiselVariationLogger());
-		}
-
+		Commands.registerCommands();
 	}
 }