diff --git a/src/commands/benchmark/BenchmarkCommandCompare.java b/src/commands/benchmark/BenchmarkCommandCompare.java
index 6870a87..2f6ae12 100644
--- a/src/commands/benchmark/BenchmarkCommandCompare.java
+++ b/src/commands/benchmark/BenchmarkCommandCompare.java
@@ -2,11 +2,11 @@ package commands.benchmark;
 
 import java.util.List;
 
-import core.benchmark.BenchmarkCommand;
-import core.benchmark.BenchmarkEntry;
-import core.benchmark.BenchmarkFormattable;
-import core.benchmark.BenchmarkInput;
-import core.benchmark.BenchmarkManager;
+import commands.benchmark.core.BenchmarkCommand;
+import commands.benchmark.core.BenchmarkEntry;
+import commands.benchmark.core.BenchmarkFormattable;
+import commands.benchmark.core.BenchmarkInput;
+import commands.benchmark.core.BenchmarkManager;
 
 public class BenchmarkCommandCompare extends BenchmarkCommand 
 {
diff --git a/src/commands/benchmark/BenchmarkCommandFind.java b/src/commands/benchmark/BenchmarkCommandFind.java
index ab01624..8d9aa54 100644
--- a/src/commands/benchmark/BenchmarkCommandFind.java
+++ b/src/commands/benchmark/BenchmarkCommandFind.java
@@ -2,7 +2,11 @@ package commands.benchmark;
 
 import java.util.List;
 
-import core.benchmark.*;
+import commands.benchmark.core.BenchmarkCommand;
+import commands.benchmark.core.BenchmarkEntry;
+import commands.benchmark.core.BenchmarkFormattable;
+import commands.benchmark.core.BenchmarkInput;
+import commands.benchmark.core.BenchmarkManager;
 
 public class BenchmarkCommandFind extends BenchmarkCommand 
 {
diff --git a/src/commands/benchmark/BenchmarkCommandInfo.java b/src/commands/benchmark/BenchmarkCommandInfo.java
index 62d08c9..b8297fa 100644
--- a/src/commands/benchmark/BenchmarkCommandInfo.java
+++ b/src/commands/benchmark/BenchmarkCommandInfo.java
@@ -2,11 +2,11 @@ package commands.benchmark;
 
 import java.util.List;
 
-import core.benchmark.BenchmarkCommand;
-import core.benchmark.BenchmarkEntry;
-import core.benchmark.BenchmarkFormattable;
-import core.benchmark.BenchmarkInput;
-import core.benchmark.BenchmarkManager;
+import commands.benchmark.core.BenchmarkCommand;
+import commands.benchmark.core.BenchmarkEntry;
+import commands.benchmark.core.BenchmarkFormattable;
+import commands.benchmark.core.BenchmarkInput;
+import commands.benchmark.core.BenchmarkManager;
 import dataStructures.KittyEmbed;
 import java.awt.Color;
 
diff --git a/src/commands/benchmark/CommandBenchmark.java b/src/commands/benchmark/CommandBenchmark.java
index 016a937..5db25ce 100644
--- a/src/commands/benchmark/CommandBenchmark.java
+++ b/src/commands/benchmark/CommandBenchmark.java
@@ -1,9 +1,9 @@
 package commands.benchmark;
 
+import commands.benchmark.core.BenchmarkFormattable;
+import commands.benchmark.core.BenchmarkFramework;
 import core.Command;
 import core.LocStrings;
-import core.benchmark.BenchmarkFormattable;
-import core.benchmark.BenchmarkFramework;
 import dataStructures.KittyChannel;
 import dataStructures.KittyGuild;
 import dataStructures.KittyRating;
diff --git a/src/core/benchmark/BenchmarkCommand.java b/src/commands/benchmark/core/BenchmarkCommand.java
similarity index 85%
rename from src/core/benchmark/BenchmarkCommand.java
rename to src/commands/benchmark/core/BenchmarkCommand.java
index 3b04e59..cc24682 100644
--- a/src/core/benchmark/BenchmarkCommand.java
+++ b/src/commands/benchmark/core/BenchmarkCommand.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 public abstract class BenchmarkCommand
 {
diff --git a/src/core/benchmark/BenchmarkEntry.java b/src/commands/benchmark/core/BenchmarkEntry.java
similarity index 94%
rename from src/core/benchmark/BenchmarkEntry.java
rename to src/commands/benchmark/core/BenchmarkEntry.java
index a883ae7..88282eb 100644
--- a/src/core/benchmark/BenchmarkEntry.java
+++ b/src/commands/benchmark/core/BenchmarkEntry.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 public class BenchmarkEntry
 {
diff --git a/src/core/benchmark/BenchmarkFormattable.java b/src/commands/benchmark/core/BenchmarkFormattable.java
similarity index 95%
rename from src/core/benchmark/BenchmarkFormattable.java
rename to src/commands/benchmark/core/BenchmarkFormattable.java
index 7261ea6..182dec0 100644
--- a/src/core/benchmark/BenchmarkFormattable.java
+++ b/src/commands/benchmark/core/BenchmarkFormattable.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 import dataStructures.KittyEmbed;
 import dataStructures.Response;
diff --git a/src/core/benchmark/BenchmarkFramework.java b/src/commands/benchmark/core/BenchmarkFramework.java
similarity index 98%
rename from src/core/benchmark/BenchmarkFramework.java
rename to src/commands/benchmark/core/BenchmarkFramework.java
index 948f7f1..f8520fa 100644
--- a/src/core/benchmark/BenchmarkFramework.java
+++ b/src/commands/benchmark/core/BenchmarkFramework.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 import java.util.HashMap;
 import commands.benchmark.*;
diff --git a/src/core/benchmark/BenchmarkInput.java b/src/commands/benchmark/core/BenchmarkInput.java
similarity index 94%
rename from src/core/benchmark/BenchmarkInput.java
rename to src/commands/benchmark/core/BenchmarkInput.java
index 84be8bf..4e8dea2 100644
--- a/src/core/benchmark/BenchmarkInput.java
+++ b/src/commands/benchmark/core/BenchmarkInput.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 import utils.StringUtils;
 
diff --git a/src/core/benchmark/BenchmarkLog.java b/src/commands/benchmark/core/BenchmarkLog.java
similarity index 90%
rename from src/core/benchmark/BenchmarkLog.java
rename to src/commands/benchmark/core/BenchmarkLog.java
index 0417f02..4e290b5 100644
--- a/src/core/benchmark/BenchmarkLog.java
+++ b/src/commands/benchmark/core/BenchmarkLog.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 import utils.GlobalLog;
 
diff --git a/src/core/benchmark/BenchmarkManager.java b/src/commands/benchmark/core/BenchmarkManager.java
similarity index 99%
rename from src/core/benchmark/BenchmarkManager.java
rename to src/commands/benchmark/core/BenchmarkManager.java
index 63bb096..7bb225d 100644
--- a/src/core/benchmark/BenchmarkManager.java
+++ b/src/commands/benchmark/core/BenchmarkManager.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 import java.time.Instant;
 import java.util.ArrayList;
diff --git a/src/core/benchmark/BenchmarkType.java b/src/commands/benchmark/core/BenchmarkType.java
similarity index 87%
rename from src/core/benchmark/BenchmarkType.java
rename to src/commands/benchmark/core/BenchmarkType.java
index 4ec566f..a3fc645 100644
--- a/src/core/benchmark/BenchmarkType.java
+++ b/src/commands/benchmark/core/BenchmarkType.java
@@ -1,4 +1,4 @@
-package core.benchmark;
+package commands.benchmark.core;
 
 public enum BenchmarkType
 {