diff --git a/build.gradle b/build.gradle
index f71c5c6..db837d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'xyz.daviddgtnt.sc.doctorattend'
-version = '1.0'
+version = '1.1'
 
 repositories {
     mavenCentral()
@@ -13,5 +13,5 @@ repositories {
 
 dependencies {
     implementation 'org.apache.groovy:groovy:4.0.2'
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
 }
\ No newline at end of file
diff --git a/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttend.java b/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttend.java
index a767098..61fa5a2 100644
--- a/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttend.java
+++ b/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttend.java
@@ -1,56 +1,18 @@
 package xyz.daviddgtnt.sc.doctorattend;
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.Collection;
-
-public class DoctorAttend implements CommandExecutor {
+public class DoctorAttend extends JavaPlugin {
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (sender instanceof ConsoleCommandSender) {
-            Bukkit.getLogger().warning("You cannot use this command from the console!");
-            return true;
-        }
-
-        if (sender.hasPermission("doctorattend.doctor")) {
-            if (args.length < 1) {
-                sender.sendMessage("You need to supply which player you are attending to!");
-                return true;
-            }
-
-            Player player = Bukkit.getPlayer(args[0]);
-
-            if (player == null) {
-                sender.sendMessage(ChatColor.RED + args[0] + " isn't online!");
-                return true;
-            }
-
-            ConsoleCommandSender commandSender = Bukkit.getConsoleSender();
-            Bukkit.dispatchCommand(commandSender, "warp hospital " + sender.getName());
-            this.notifyDoctors(sender, player);
-        } else {
-            sender.sendMessage(ChatColor.RED + "You need to be a doctor to attend to patients!");
-        }
-
-        return true;
+    public void onEnable() {
+        Bukkit.getLogger().info("Enabled " + this.getName());
+        this.getCommand("needdoctor").setExecutor(new NeedDoctorCommand());
+        this.getCommand("doctorattend").setExecutor(new DoctorAttendCommand());
     }
 
-    private void notifyDoctors(CommandSender sender, Player player) {
-        String senderName = sender.getName();
-        String playerName = player.getName();
-
-        Collection<? extends Player> players = Bukkit.getOnlinePlayers();
-
-        for (Player p : players) {
-            if (p.hasPermission("doctorattend.doctor")) {
-                p.sendMessage(ChatColor.RED + senderName + " is attending to " + playerName + ".");
-            }
-        }
+    @Override
+    public void onDisable() {
+        Bukkit.getLogger().info("Disabled " + this.getName());
     }
 }
diff --git a/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttendCommand.java b/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttendCommand.java
new file mode 100644
index 0000000..0105c85
--- /dev/null
+++ b/src/main/java/xyz/daviddgtnt/sc/doctorattend/DoctorAttendCommand.java
@@ -0,0 +1,56 @@
+package xyz.daviddgtnt.sc.doctorattend;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Collection;
+
+public class DoctorAttendCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (sender instanceof ConsoleCommandSender) {
+            Bukkit.getLogger().warning("You cannot use this command from the console!");
+            return true;
+        }
+
+        if (sender.hasPermission("doctorattend.doctor")) {
+            if (args.length < 1) {
+                sender.sendMessage("You need to supply which player you are attending to!");
+                return true;
+            }
+
+            Player player = Bukkit.getPlayer(args[0]);
+
+            if (player == null) {
+                sender.sendMessage(ChatColor.RED + args[0] + " isn't online!");
+                return true;
+            }
+
+            ConsoleCommandSender commandSender = Bukkit.getConsoleSender();
+            Bukkit.dispatchCommand(commandSender, "warp hospital " + sender.getName());
+            this.notifyDoctors(sender, player);
+        } else {
+            sender.sendMessage(ChatColor.RED + "You need to be a doctor to attend to patients!");
+        }
+
+        return true;
+    }
+
+    private void notifyDoctors(CommandSender sender, Player player) {
+        String senderName = sender.getName();
+        String playerName = player.getName();
+
+        Collection<? extends Player> players = Bukkit.getOnlinePlayers();
+
+        for (Player p : players) {
+            if (p.hasPermission("doctorattend.doctor")) {
+                p.sendMessage(ChatColor.RED + senderName + " is attending to " + playerName + ".");
+            }
+        }
+    }
+}
diff --git a/src/main/java/xyz/daviddgtnt/sc/doctorattend/Main.java b/src/main/java/xyz/daviddgtnt/sc/doctorattend/Main.java
deleted file mode 100644
index c9999ab..0000000
--- a/src/main/java/xyz/daviddgtnt/sc/doctorattend/Main.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package xyz.daviddgtnt.sc.doctorattend;
-
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class Main extends JavaPlugin {
-    @Override
-    public void onEnable() {
-        Bukkit.getLogger().info("Enabled " + this.getName());
-        this.getCommand("needdoctor").setExecutor(new NeedDoctor());
-        this.getCommand("doctorattend").setExecutor(new DoctorAttend());
-    }
-
-    @Override
-    public void onDisable() {
-        Bukkit.getLogger().info("Disabled " + this.getName());
-    }
-}
diff --git a/src/main/java/xyz/daviddgtnt/sc/doctorattend/NeedDoctor.java b/src/main/java/xyz/daviddgtnt/sc/doctorattend/NeedDoctorCommand.java
similarity index 96%
rename from src/main/java/xyz/daviddgtnt/sc/doctorattend/NeedDoctor.java
rename to src/main/java/xyz/daviddgtnt/sc/doctorattend/NeedDoctorCommand.java
index c4045c6..d1fdac7 100644
--- a/src/main/java/xyz/daviddgtnt/sc/doctorattend/NeedDoctor.java
+++ b/src/main/java/xyz/daviddgtnt/sc/doctorattend/NeedDoctorCommand.java
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 
 import java.util.Collection;
 
-public class NeedDoctor implements CommandExecutor {
+public class NeedDoctorCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         Player player;
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1b69c3f..da1e980 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: SCDoctorAttend
-version: 1.0
+version: 1.1
 author: DavidDGTNT
-main: xyz.daviddgtnt.sc.doctorattend.Main
+main: xyz.daviddgtnt.sc.doctorattend.DoctorAttend
 api-version: '1.20'
 softdepend:
   - Essentials