diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 6f315ed..777ef51 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -1,8 +1,7 @@
 package com.bbn.hadder;
 
-import com.bbn.hadder.commands.TestCommand;
+import com.bbn.hadder.commands.general.*;
 import com.bbn.hadder.commands.fun.GifCommand;
-import com.bbn.hadder.commands.general.PingCommand;
 import com.bbn.hadder.commands.moderation.*;
 import com.bbn.hadder.commands.owner.ShutdownCommand;
 import com.bbn.hadder.commands.settings.PrefixCommand;
diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java
index 68fa912..5991325 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@@ -65,7 +65,6 @@ public class Rethink {
         try {
             Cursor cursor = r.table("server")
                     .insert(r.hashMap("id", id)
-                            .with("prefix", "h.")
                     ).run(conn);
             out = cursor.next().toString();
         } catch (ClassCastException ignored) {}
diff --git a/src/main/java/com/bbn/hadder/commands/TestCommand.java b/src/main/java/com/bbn/hadder/commands/general/TestCommand.java
similarity index 76%
rename from src/main/java/com/bbn/hadder/commands/TestCommand.java
rename to src/main/java/com/bbn/hadder/commands/general/TestCommand.java
index d31867a..b4ca20d 100644
--- a/src/main/java/com/bbn/hadder/commands/TestCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/TestCommand.java
@@ -1,11 +1,16 @@
-package com.bbn.hadder.commands;
+package com.bbn.hadder.commands.general;
 
 /*
  * @author Skidder / GregTCLTK
  */
 
+import com.bbn.hadder.commands.Command;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
+/*
+ * @author Skidder / GregTCLTK
+ */
+
 public class TestCommand implements Command {
 
     public void executed(String[] args, MessageReceivedEvent event) {
diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
index 86bfbca..07fc48e 100644
--- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
@@ -14,26 +14,21 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 public class PrefixCommand implements Command {
     public void executed(String[] args, MessageReceivedEvent event) {
-        if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MANAGE_SERVER)) {
-            if (args.length == 1) {
-                if (!args[0].contains("\"")) {
+        if (args.length == 1) {
+            if (!args[0].contains("\"")) {
 
-                    Rethink.update("server", event.getGuild().getId(), "prefix", args[0]);
+                Rethink.update("user", event.getAuthor().getId(), "prefix", args[0]);
 
-                    EmbedBuilder builder = new EmbedBuilder();
+                EmbedBuilder builder = new EmbedBuilder();
 
-                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for this server to " + args[0]).build()).queue();
-                } else {
-                    EmbedBuilder builder = new EmbedBuilder();
-                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue();
-                }
+                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue();
             } else {
                 EmbedBuilder builder = new EmbedBuilder();
-                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue();
+                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue();
             }
         } else {
             EmbedBuilder builder = new EmbedBuilder();
-            event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue();
+            event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue();
         }
     }
 
diff --git a/src/main/java/com/bbn/hadder/core/CommandParser.java b/src/main/java/com/bbn/hadder/core/CommandParser.java
index a801d9f..4bcf0d0 100644
--- a/src/main/java/com/bbn/hadder/core/CommandParser.java
+++ b/src/main/java/com/bbn/hadder/core/CommandParser.java
@@ -13,7 +13,7 @@ import java.util.Collections;
 public class CommandParser {
     public static commandContainer parser(String raw, MessageReceivedEvent event) {
 
-        String cmd = raw.replaceFirst(Rethink.get("server", "id", event.getGuild().getId(), "prefix"), "");
+        String cmd = raw.replaceFirst(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"), "");
         String[] cmdsplit = cmd.split(" ");
         String invoke = cmdsplit[0];
         ArrayList<String> split = new ArrayList<>();
diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java
index a3cfa4f..81485f2 100644
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java
@@ -19,7 +19,7 @@ public class CommandListener extends ListenerAdapter {
     @Override
     public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
         if (event.isFromType(ChannelType.TEXT)) {
-            if (event.getMessage().getContentRaw().startsWith(Rethink.get("server", "id", event.getGuild().getId(), "prefix"))) {
+            if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
                 if (!event.getAuthor().isBot()) {
                     CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event));
                 } else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {