diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 00358e9ee60..2621b3a31ff 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -33,6 +33,7 @@
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.registrations.Feature;
+import ch.njol.skript.skcommand.SkriptCommand;
 import ch.njol.skript.test.runner.EffObjectives;
 import ch.njol.skript.test.runner.SkriptAsyncJUnitTest;
 import ch.njol.skript.test.runner.SkriptJUnitTest;
@@ -546,7 +547,6 @@ public void onEnable() {
 		// Use the updater, now that it has been configured to (not) do stuff
 		if (updater != null) {
 			CommandSender console = Bukkit.getConsoleSender();
-			assert console != null;
 			assert updater != null;
 			updater.updateCheck(console);
 		}
@@ -559,9 +559,10 @@ public void onEnable() {
 		}
 
 		PluginCommand skriptCommand = getCommand("skript");
-		assert skriptCommand != null; // It is defined, unless build is corrupted or something like that
-		skriptCommand.setExecutor(new SkriptCommand());
-		skriptCommand.setTabCompleter(new SkriptCommandTabCompleter());
+		assert skriptCommand != null; // It is defined, unless the build is corrupted or something like that
+		SkriptCommand commandHandler = new SkriptCommand();
+		skriptCommand.setExecutor(commandHandler);
+		skriptCommand.setTabCompleter(commandHandler);
 
 		// Load Bukkit stuff. It is done after platform check, because something might be missing!
 		new BukkitEventValues();
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
deleted file mode 100644
index d27ec05ed45..00000000000
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ /dev/null
@@ -1,561 +0,0 @@
-package ch.njol.skript;
-
-import ch.njol.skript.aliases.Aliases;
-import ch.njol.skript.command.CommandHelp;
-import ch.njol.skript.doc.Documentation;
-import ch.njol.skript.doc.HTMLGenerator;
-import ch.njol.skript.doc.JSONGenerator;
-import ch.njol.skript.localization.ArgsMessage;
-import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.PluralizingArgsMessage;
-import ch.njol.skript.log.LogEntry;
-import ch.njol.skript.log.RedirectingLogHandler;
-import ch.njol.skript.log.TestingLogHandler;
-import ch.njol.skript.log.TimingLogHandler;
-import ch.njol.skript.test.runner.SkriptTestEvent;
-import ch.njol.skript.test.runner.TestMode;
-import ch.njol.skript.test.runner.TestTracker;
-import ch.njol.skript.test.utils.TestResults;
-import ch.njol.skript.util.ExceptionUtils;
-import ch.njol.skript.util.FileUtils;
-import ch.njol.skript.util.SkriptColor;
-import ch.njol.skript.util.Utils;
-import ch.njol.util.OpenCloseable;
-import ch.njol.util.StringUtils;
-import com.google.gson.GsonBuilder;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.script.Script;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-
-public class SkriptCommand implements CommandExecutor {
-
-	private static final String CONFIG_NODE = "skript command";
-	private static final ArgsMessage m_reloading = new ArgsMessage(CONFIG_NODE + ".reload.reloading");
-
-	// TODO document this command on the website
-	private static final CommandHelp SKRIPT_COMMAND_HELP = new CommandHelp("<gray>/<gold>skript", SkriptColor.LIGHT_CYAN, CONFIG_NODE + ".help")
-			.add(new CommandHelp("reload", SkriptColor.DARK_RED)
-				.add("all")
-				.add("config")
-				.add("aliases")
-				.add("scripts")
-				.add("<script>")
-			).add(new CommandHelp("enable", SkriptColor.DARK_RED)
-				.add("all")
-				.add("<script>")
-			).add(new CommandHelp("disable", SkriptColor.DARK_RED)
-				.add("all")
-				.add("<script>")
-			).add(new CommandHelp("update", SkriptColor.DARK_RED)
-				.add("check")
-				.add("changes")
-			)
-			.add("list")
-			.add("show")
-			.add("info")
-			.add("help");
-
-	static {
-		// Add command to generate documentation
-		if (TestMode.GEN_DOCS || Documentation.isDocsTemplateFound())
-			SKRIPT_COMMAND_HELP.add("gen-docs");
-
-		// Add command to run individual tests
-		if (TestMode.DEV_MODE)
-			SKRIPT_COMMAND_HELP.add("test");
-	}
-
-	private static void reloading(CommandSender sender, String what, RedirectingLogHandler logHandler, Object... args) {
-		what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : Language.format(CONFIG_NODE + ".reload." + what, args);
-		String message = StringUtils.fixCapitalization(m_reloading.toString(what));
-		Skript.info(sender, message);
-
-		// Log reloading message
-		String text = Language.format(CONFIG_NODE + ".reload." + "player reload", sender.getName(), what);
-		logHandler.log(new LogEntry(Level.INFO, Utils.replaceEnglishChatStyles(text)), sender);
-	}
-
-	private static final ArgsMessage m_reloaded = new ArgsMessage(CONFIG_NODE + ".reload.reloaded");
-	private static final ArgsMessage m_reload_error = new ArgsMessage(CONFIG_NODE + ".reload.error");
-
-	private static void reloaded(CommandSender sender, RedirectingLogHandler logHandler, TimingLogHandler timingLogHandler, String what, Object... args) {
-		what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + ".reload." + what, args));
-		String timeTaken = String.valueOf(timingLogHandler.getTimeTaken());
-
-		String message;
-		if (logHandler.numErrors() == 0) {
-			message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reloaded.toString(what, timeTaken)));
-			logHandler.log(new LogEntry(Level.INFO, Utils.replaceEnglishChatStyles(message)));
-		} else {
-			message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reload_error.toString(what, logHandler.numErrors(), timeTaken)));
-			logHandler.log(new LogEntry(Level.SEVERE, Utils.replaceEnglishChatStyles(message)));
-		}
-	}
-
-	private static void info(CommandSender sender, String what, Object... args) {
-		what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args));
-		Skript.info(sender, StringUtils.fixCapitalization(what));
-	}
-
-	private static void error(CommandSender sender, String what, Object... args) {
-		what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args));
-		Skript.error(sender, StringUtils.fixCapitalization(what));
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!SKRIPT_COMMAND_HELP.test(sender, args))
-			return true;
-
-		Set<CommandSender> recipients = new HashSet<>();
-		recipients.add(sender);
-
-		if (args[0].equalsIgnoreCase("reload")) {
-			recipients.addAll(Bukkit.getOnlinePlayers().stream()
-				.filter(player -> player.hasPermission("skript.reloadnotify"))
-				.collect(Collectors.toSet()));
-		}
-
-		try (
-			RedirectingLogHandler logHandler = new RedirectingLogHandler(recipients, "").start();
-			TimingLogHandler timingLogHandler = new TimingLogHandler().start()
-		) {
-
-			if (args[0].equalsIgnoreCase("reload")) {
-
-				if (args[1].equalsIgnoreCase("all")) {
-					reloading(sender, "config, aliases and scripts", logHandler);
-					SkriptConfig.load();
-					Aliases.clear();
-					Aliases.loadAsync().thenRun(() -> {
-						ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
-						ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(logHandler, timingLogHandler))
-							.thenAccept(info -> {
-								if (info.files == 0)
-									Skript.warning(Skript.m_no_scripts.toString());
-								reloaded(sender, logHandler, timingLogHandler, "config, aliases and scripts");
-							});
-					});
-				} else if (args[1].equalsIgnoreCase("scripts")) {
-					reloading(sender, "scripts", logHandler);
-
-					ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
-					ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(logHandler, timingLogHandler))
-						.thenAccept(info -> {
-							if (info.files == 0)
-								Skript.warning(Skript.m_no_scripts.toString());
-							reloaded(sender, logHandler, timingLogHandler, "scripts");
-						});
-				} else if (args[1].equalsIgnoreCase("config")) {
-					reloading(sender, "main config", logHandler);
-					SkriptConfig.load();
-					reloaded(sender, logHandler, timingLogHandler, "main config");
-				} else if (args[1].equalsIgnoreCase("aliases")) {
-					reloading(sender, "aliases", logHandler);
-					Aliases.clear();
-					Aliases.loadAsync().thenRun(() -> reloaded(sender, logHandler, timingLogHandler, "aliases"));
-				} else { // Reloading an individual Script or folder
-					File scriptFile = getScriptFromArgs(sender, args);
-					if (scriptFile == null)
-						return true;
-
-					if (!scriptFile.isDirectory()) {
-						if (ScriptLoader.getDisabledScriptsFilter().accept(scriptFile)) {
-							info(sender, "reload.script disabled", scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH), StringUtils.join(args, " ", 1, args.length));
-							return true;
-						}
-
-						reloading(sender, "script", logHandler, scriptFile.getName());
-
-						Script script = ScriptLoader.getScript(scriptFile);
-						if (script != null)
-							ScriptLoader.unloadScript(script);
-						ScriptLoader.loadScripts(scriptFile, OpenCloseable.combine(logHandler, timingLogHandler))
-							.thenAccept(scriptInfo ->
-								reloaded(sender, logHandler, timingLogHandler, "script", scriptFile.getName())
-							);
-					} else {
-						final String fileName = scriptFile.getName();
-						reloading(sender, "scripts in folder", logHandler, fileName);
-						ScriptLoader.unloadScripts(ScriptLoader.getScripts(scriptFile));
-						ScriptLoader.loadScripts(scriptFile, OpenCloseable.combine(logHandler, timingLogHandler))
-							.thenAccept(scriptInfo -> {
-								if (scriptInfo.files == 0) {
-									info(sender, "reload.empty folder", fileName);
-								} else {
-									if (logHandler.numErrors() == 0) {
-										reloaded(sender, logHandler, timingLogHandler, "x scripts in folder success", fileName, scriptInfo.files);
-									} else {
-										reloaded(sender, logHandler, timingLogHandler, "x scripts in folder error", fileName, scriptInfo.files);
-									}
-								}
-							});
-					}
-				}
-
-			} else if (args[0].equalsIgnoreCase("enable")) {
-
-				if (args[1].equalsIgnoreCase("all")) {
-					try {
-						info(sender, "enable.all.enabling");
-						ScriptLoader.loadScripts(toggleFiles(Skript.getInstance().getScriptsFolder(), true), logHandler)
-							.thenAccept(scriptInfo -> {
-								if (logHandler.numErrors() == 0) {
-									info(sender, "enable.all.enabled");
-								} else {
-									error(sender, "enable.all.error", logHandler.numErrors());
-								}
-							});
-					} catch (IOException e) {
-						error(sender, "enable.all.io error", ExceptionUtils.toString(e));
-					}
-				} else {
-					File scriptFile = getScriptFromArgs(sender, args);
-					if (scriptFile == null)
-						return true;
-
-					if (!scriptFile.isDirectory()) {
-						if (ScriptLoader.getLoadedScriptsFilter().accept(scriptFile)) {
-							info(sender, "enable.single.already enabled", scriptFile.getName(), StringUtils.join(args, " ", 1, args.length));
-							return true;
-						}
-
-						try {
-							scriptFile = toggleFile(scriptFile, true);
-						} catch (IOException e) {
-							error(sender, "enable.single.io error", scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH), ExceptionUtils.toString(e));
-							return true;
-						}
-
-						final String fileName = scriptFile.getName();
-						info(sender, "enable.single.enabling", fileName);
-						ScriptLoader.loadScripts(scriptFile, logHandler)
-							.thenAccept(scriptInfo -> {
-								if (logHandler.numErrors() == 0) {
-									info(sender, "enable.single.enabled", fileName);
-								} else {
-									error(sender, "enable.single.error", fileName, logHandler.numErrors());
-								}
-							});
-					} else {
-						Set<File> scriptFiles;
-						try {
-							scriptFiles = toggleFiles(scriptFile, true);
-						} catch (IOException e) {
-							error(sender, "enable.folder.io error", scriptFile.getName(), ExceptionUtils.toString(e));
-							return true;
-						}
-
-						if (scriptFiles.isEmpty()) {
-							info(sender, "enable.folder.empty", scriptFile.getName());
-							return true;
-						}
-
-						final String fileName = scriptFile.getName();
-						info(sender, "enable.folder.enabling", fileName, scriptFiles.size());
-						ScriptLoader.loadScripts(scriptFiles, logHandler)
-							.thenAccept(scriptInfo -> {
-								if (logHandler.numErrors() == 0) {
-									info(sender, "enable.folder.enabled", fileName, scriptInfo.files);
-								} else {
-									error(sender, "enable.folder.error", fileName, logHandler.numErrors());
-								}
-							});
-					}
-				}
-
-			} else if (args[0].equalsIgnoreCase("disable")) {
-
-				if (args[1].equalsIgnoreCase("all")) {
-					ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
-					try {
-						toggleFiles(Skript.getInstance().getScriptsFolder(), false);
-						info(sender, "disable.all.disabled");
-					} catch (IOException e) {
-						error(sender, "disable.all.io error", ExceptionUtils.toString(e));
-					}
-				} else {
-					File scriptFile = getScriptFromArgs(sender, args);
-					if (scriptFile == null) // TODO allow disabling deleted/renamed scripts
-						return true;
-
-					if (!scriptFile.isDirectory()) {
-						if (ScriptLoader.getDisabledScriptsFilter().accept(scriptFile)) {
-							info(sender, "disable.single.already disabled", scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH));
-							return true;
-						}
-
-						Script script = ScriptLoader.getScript(scriptFile);
-						if (script != null)
-							ScriptLoader.unloadScript(script);
-
-						String fileName = scriptFile.getName();
-
-						try {
-							toggleFile(scriptFile, false);
-						} catch (IOException e) {
-							error(sender, "disable.single.io error", scriptFile.getName(), ExceptionUtils.toString(e));
-							return true;
-						}
-						info(sender, "disable.single.disabled", fileName);
-					} else {
-						ScriptLoader.unloadScripts(ScriptLoader.getScripts(scriptFile));
-
-						Set<File> scripts;
-						try {
-							scripts = toggleFiles(scriptFile, false);
-						} catch (IOException e) {
-							error(sender, "disable.folder.io error", scriptFile.getName(), ExceptionUtils.toString(e));
-							return true;
-						}
-
-						if (scripts.isEmpty()) {
-							info(sender, "disable.folder.empty", scriptFile.getName());
-							return true;
-						}
-
-						info(sender, "disable.folder.disabled", scriptFile.getName(), scripts.size());
-					}
-				}
-
-			} else if (args[0].equalsIgnoreCase("update")) {
-				SkriptUpdater updater = Skript.getInstance().getUpdater();
-				if (updater == null) { // Oh. That is bad
-					Skript.info(sender, "" + SkriptUpdater.m_internal_error);
-					return true;
-				}
-				if (args[1].equalsIgnoreCase("check")) {
-					updater.updateCheck(sender);
-				} else if (args[1].equalsIgnoreCase("changes")) {
-					updater.changesCheck(sender);
-				}
-			} else if (args[0].equalsIgnoreCase("info")) {
-				info(sender, "info.aliases");
-				info(sender, "info.documentation");
-				info(sender, "info.tutorials");
-				info(sender, "info.server", Bukkit.getVersion());
-
-				SkriptUpdater updater = Skript.getInstance().getUpdater();
-				if (updater != null) {
-					info(sender, "info.version", Skript.getVersion() + " (" + updater.getCurrentRelease().flavor + ")");
-				} else {
-					info(sender, "info.version", Skript.getVersion());
-				}
-
-				Collection<SkriptAddon> addons = Skript.getAddons();
-				info(sender, "info.addons", addons.isEmpty() ? "None" : "");
-				for (SkriptAddon addon : addons) {
-					PluginDescriptionFile desc = addon.plugin.getDescription();
-					String web = desc.getWebsite();
-					Skript.info(sender, " - " + desc.getFullName() + (web != null ? " (" + web + ")" : ""));
-				}
-
-				List<String> dependencies = Skript.getInstance().getDescription().getSoftDepend();
-				boolean dependenciesFound = false;
-				for (String dep : dependencies) { // Check if any dependency is found in the server plugins
-					Plugin plugin = Bukkit.getPluginManager().getPlugin(dep);
-					if (plugin != null) {
-						if (!dependenciesFound) {
-							dependenciesFound = true;
-							info(sender, "info.dependencies", "");
-						}
-						String ver = plugin.getDescription().getVersion();
-						Skript.info(sender, " - " + plugin.getName() + " v" + ver);
-					}
-				}
-				if (!dependenciesFound)
-					info(sender, "info.dependencies", "None");
-
-			} else if (args[0].equalsIgnoreCase("gen-docs")) {
-				File templateDir = Documentation.getDocsTemplateDirectory();
-				File outputDir = Documentation.getDocsOutputDirectory();
-				outputDir.mkdirs();
-
-				Skript.info(sender, "Generating docs...");
-				JSONGenerator jsonGenerator = new JSONGenerator(templateDir, outputDir);
-				jsonGenerator.generate();
-
-				if (!templateDir.exists()) {
-					Skript.info(sender, "JSON-only documentation generated!");
-					return true;
-				}
-
-				HTMLGenerator htmlGenerator = new HTMLGenerator(templateDir, outputDir);
-				htmlGenerator.generate(); // Try to generate docs... hopefully
-				Skript.info(sender, "All documentation generated!");
-			} else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) {
-				File scriptFile;
-				if (args.length == 1) {
-					scriptFile = TestMode.lastTestFile;
-					if (scriptFile == null) {
-						Skript.error(sender, "No test script has been run yet!");
-						return true;
-					}
-				} else {
-					if (args[1].equalsIgnoreCase("all")) {
-						scriptFile = TestMode.TEST_DIR.toFile();
-					} else {
-						scriptFile = getScriptFromArgs(sender, args, TestMode.TEST_DIR.toFile());
-						TestMode.lastTestFile = scriptFile;
-					}
-				}
-
-				if (scriptFile == null || !scriptFile.exists()) {
-					Skript.error(sender, "Test script doesn't exist!");
-					return true;
-				}
-
-				// Close previous loggers before we create a new one
-				// This prevents closing logger errors
-				timingLogHandler.close();
-				logHandler.close();
-
-				TestingLogHandler errorCounter = new TestingLogHandler(Level.SEVERE).start();
-				ScriptLoader.loadScripts(scriptFile, errorCounter)
-					.thenAccept(scriptInfo ->
-						// Code should run on server thread
-						Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> {
-							Bukkit.getPluginManager().callEvent(new SkriptTestEvent()); // Run it
-							ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
-
-							// Get results and show them
-							TestResults testResults = TestTracker.collectResults();
-							String[] lines = testResults.createReport().split("\n");
-							for (String line : lines) {
-								Skript.info(sender, line);
-							}
-
-							// Log results to file
-							Skript.info(sender, "Collecting results to " + TestMode.RESULTS_FILE);
-							String results = new GsonBuilder()
-								.setPrettyPrinting() // Easier to read lines
-								.disableHtmlEscaping() // Fixes issue with "'" character in test strings going unicode
-								.create().toJson(testResults);
-							try {
-								Files.writeString(TestMode.RESULTS_FILE, results);
-							} catch (IOException e) {
-								Skript.exception(e, "Failed to write test results.");
-							}
-						})
-					);
-			} else if (args[0].equalsIgnoreCase("list") || args[0].equalsIgnoreCase("show")) {
-				info(sender, "list.enabled.header");
-				ScriptLoader.getLoadedScripts().stream()
-						.map(script -> script.getConfig().getFileName())
-						.forEach(name -> info(sender, "list.enabled.element", name));
-				info(sender, "list.disabled.header");
-				ScriptLoader.getDisabledScripts().stream()
-						.flatMap(file -> {
-							if (file.isDirectory()) {
-								return getSubFiles(file).stream();
-							}
-							return Arrays.stream(new File[]{file});
-						})
-						.map(File::getPath)
-						.map(path -> path.substring(Skript.getInstance().getScriptsFolder().getPath().length() + 1))
-						.forEach(path -> info(sender, "list.disabled.element", path));
-			} else if (args[0].equalsIgnoreCase("help")) {
-				SKRIPT_COMMAND_HELP.showHelp(sender);
-			}
-
-		} catch (Exception e) {
-			//noinspection ThrowableNotThrown
-			Skript.exception(e, "Exception occurred in Skript's main command", "Used command: /" + label + " " + StringUtils.join(args, " "));
-		}
-
-		return true;
-	}
-
-	private static final ArgsMessage m_invalid_script = new ArgsMessage(CONFIG_NODE + ".invalid script");
-	private static final ArgsMessage m_invalid_folder = new ArgsMessage(CONFIG_NODE + ".invalid folder");
-
-	private static List<File> getSubFiles(File file) {
-		List<File> files = new ArrayList<>();
-		if (file.isDirectory()) {
-			for (File listFile : file.listFiles(f -> !f.isHidden())) {
-				if (listFile.isDirectory()) {
-					files.addAll(getSubFiles(listFile));
-				} else if (listFile.getName().endsWith(".sk")) {
-					files.add(listFile);
-				}
-			}
-		}
-		return files;
-	}
-
-	private static @Nullable File getScriptFromArgs(CommandSender sender, String[] args) {
-		return getScriptFromArgs(sender, args, Skript.getInstance().getScriptsFolder());
-	}
-
-	private static @Nullable File getScriptFromArgs(CommandSender sender, String[] args, File directoryFile) {
-		String script = StringUtils.join(args, " ", 1, args.length);
-		File f = ScriptLoader.getScriptFromName(script, directoryFile);
-		if (f == null) {
-			// Always allow '/' and '\' regardless of OS
-			boolean directory = script.endsWith("/") || script.endsWith("\\") || script.endsWith(File.separator);
-			Skript.error(sender, (directory ? m_invalid_folder : m_invalid_script).toString(script));
-			return null;
-		}
-		return f;
-	}
-
-	/**
-	 * @deprecated Use {@link ScriptLoader#getScriptFromName(String)} instead.
-	 */
-	@Nullable
-	@Deprecated(since = "2.10.0", forRemoval = true)
-	public static File getScriptFromName(String script) {
-		return ScriptLoader.getScriptFromName(script);
-	}
-
-	private static File toggleFile(File file, boolean enable) throws IOException {
-		if (enable)
-			return FileUtils.move(
-				file,
-				new File(file.getParentFile(), file.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH)),
-				false
-			);
-		return FileUtils.move(
-			file,
-			new File(file.getParentFile(), ScriptLoader.DISABLED_SCRIPT_PREFIX + file.getName()),
-			false
-		);
-	}
-
-	private static Set<File> toggleFiles(File folder, boolean enable) throws IOException {
-		FileFilter filter = enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter();
-
-		Set<File> changed = new HashSet<>();
-		for (File file : folder.listFiles()) {
-			if (file.isDirectory()) {
-				changed.addAll(toggleFiles(file, enable));
-			} else {
-				if (filter.accept(file)) {
-					String fileName = file.getName();
-					changed.add(FileUtils.move(
-						file,
-						new File(file.getParentFile(), enable ? fileName.substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH) : ScriptLoader.DISABLED_SCRIPT_PREFIX + fileName),
-						false
-					));
-				}
-			}
-		}
-
-		return changed;
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java b/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java
deleted file mode 100644
index c73da8e9f02..00000000000
--- a/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package ch.njol.skript;
-
-import ch.njol.skript.doc.Documentation;
-import ch.njol.skript.test.runner.TestMode;
-import ch.njol.util.StringUtils;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class SkriptCommandTabCompleter implements TabCompleter {
-
-	@Override
-	@Nullable
-	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-		ArrayList<String> options = new ArrayList<>();
-		
-		if (!command.getName().equalsIgnoreCase("skript"))
-			return null;
-		
-		if (args[0].equalsIgnoreCase("update") && args.length == 2) {
-			options.add("check");
-			options.add("changes");
-		} else if (args[0].matches("(?i)(reload|disable|enable|test)") && args.length >= 2) {
-			boolean useTestDirectory = args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE;
-			File scripts = useTestDirectory ? TestMode.TEST_DIR.toFile() : Skript.getInstance().getScriptsFolder();
-			String scriptsPathString = scripts.toPath().toString();
-			int scriptsPathLength = scriptsPathString.length();
-
-			String scriptArg = StringUtils.join(args, " ", 1, args.length);
-			String fs = File.separator;
-
-			boolean enable = args[0].equalsIgnoreCase("enable");
-
-			// Live update, this will get all old and new (even not loaded) scripts
-			// TODO Find a better way for caching, it isn't exactly ideal to be calling this method constantly
-			try (Stream<Path> files = Files.walk(scripts.toPath())) {
-				files.map(Path::toFile)
-					.forEach(file -> {
-						if (!(enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter()).accept(file))
-							return;
-
-						// Ignore hidden files like .git/ for users that use git source control.
-						if (file.isHidden())
-							return;
-
-						String fileString = file.toString().substring(scriptsPathLength);
-						if (fileString.isEmpty())
-							return;
-
-						if (file.isDirectory()) {
-							fileString = fileString + fs; // Add file separator at the end of directories
-						} else if (file.getParentFile().toPath().toString().equals(scriptsPathString)) {
-							fileString = fileString.substring(1); // Remove file separator from the beginning of files or directories in root only
-							if (fileString.isEmpty())
-								return;
-						}
-
-						// Make sure the user's argument matches with the file's name or beginning of file path
-						if (scriptArg.length() > 0 && !file.getName().startsWith(scriptArg) && !fileString.startsWith(scriptArg))
-							return;
-
-						// Trim off previous arguments if needed
-						if (args.length > 2 && fileString.length() >= scriptArg.length())
-							fileString = fileString.substring(scriptArg.lastIndexOf(" ") + 1);
-
-						// Just in case
-						if (fileString.isEmpty())
-							return;
-
-						options.add(fileString);
-					});
-			} catch (Exception e) {
-				//noinspection ThrowableNotThrown
-				Skript.exception(e, "An error occurred while trying to update the list of disabled scripts!");
-			}
-			
-			// These will be added even if there are incomplete script arg
-			if (args.length == 2) {
-				options.add("all");
-				if (args[0].equalsIgnoreCase("reload")) {
-					options.add("config");
-					options.add("aliases");
-					options.add("scripts");
-				}
-			}
-
-		} else if (args.length == 1) {
-			options.add("help");
-			options.add("reload");
-			options.add("enable");
-			options.add("disable");
-			options.add("update");
-			options.add("list");
-			options.add("show");
-			options.add("info");
-			if (Documentation.getDocsTemplateDirectory().exists())
-				options.add("gen-docs");
-			if (TestMode.DEV_MODE)
-				options.add("test");
-		}
-		
-		return options;
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/SkriptConfig.java b/src/main/java/ch/njol/skript/SkriptConfig.java
index 9c407b5985b..1bfe867d5b1 100644
--- a/src/main/java/ch/njol/skript/SkriptConfig.java
+++ b/src/main/java/ch/njol/skript/SkriptConfig.java
@@ -387,7 +387,7 @@ private static void userDisableHooks(Class<? extends Hook<?>> hookClass, boolean
 	}
 
 	// also used for reloading
-	static void load() {
+	public static void load() {
 		if (mainConfig != null)
 			mainConfig.invalidate(); // todo
 		try {
diff --git a/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java b/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java
index 67bdb250e10..85c1c931f63 100644
--- a/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java
+++ b/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java
@@ -2,7 +2,6 @@
 
 import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
-import ch.njol.skript.SkriptCommand;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
diff --git a/src/main/java/ch/njol/skript/effects/EffScriptFile.java b/src/main/java/ch/njol/skript/effects/EffScriptFile.java
index 5a90098798b..7f52ae251e6 100644
--- a/src/main/java/ch/njol/skript/effects/EffScriptFile.java
+++ b/src/main/java/ch/njol/skript/effects/EffScriptFile.java
@@ -2,24 +2,14 @@
 
 import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
-import ch.njol.skript.SkriptCommand;
-import ch.njol.skript.command.ScriptCommand;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
-import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.PluralizingArgsMessage;
-import ch.njol.skript.log.LogEntry;
-import ch.njol.skript.log.LogHandler;
 import ch.njol.skript.log.RedirectingLogHandler;
-import ch.njol.skript.log.RetainingLogHandler;
-import ch.njol.skript.log.TimingLogHandler;
 import ch.njol.skript.registrations.Feature;
-import ch.njol.skript.util.Utils;
-import ch.njol.util.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Nullable;
@@ -36,7 +26,6 @@
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 @Name("Enable/Disable/Unload/Reload Script")
diff --git a/src/main/java/ch/njol/skript/localization/Language.java b/src/main/java/ch/njol/skript/localization/Language.java
index aa61d532ea5..9b77db152c7 100644
--- a/src/main/java/ch/njol/skript/localization/Language.java
+++ b/src/main/java/ch/njol/skript/localization/Language.java
@@ -7,7 +7,6 @@
 import ch.njol.skript.util.Version;
 import org.skriptlang.skript.addon.SkriptAddon;
 import org.skriptlang.skript.localization.Localizer;
-import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -77,8 +76,8 @@ private static String get_i(String key) {
 	 * @return The requested message if it exists or the key otherwise
 	 */
 	public static String get(String key) {
-		String s = get_i("" + key.toLowerCase(Locale.ENGLISH));
-		return s == null ? "" + key.toLowerCase(Locale.ENGLISH) : s;
+		String s = get_i(key.toLowerCase(Locale.ENGLISH));
+		return s == null ? key.toLowerCase(Locale.ENGLISH) : s;
 	}
 
 	/**
@@ -89,7 +88,7 @@ public static String get(String key) {
 	 */
 	@Nullable
 	public static String get_(String key) {
-		return get_i("" + key.toLowerCase(Locale.ENGLISH));
+		return get_i(key.toLowerCase(Locale.ENGLISH));
 	}
 
 	public static void missingEntryError(String key) {
@@ -103,12 +102,12 @@ public static void missingEntryError(String key) {
 	 * @return The formatted string
 	 */
 	public static String format(String key, Object... args) {
-		key = "" + key.toLowerCase(Locale.ENGLISH);
+		key = key.toLowerCase(Locale.ENGLISH);
 		String value = get_i(key);
 		if (value == null)
 			return key;
 		try {
-			return "" + String.format(value, args);
+			return String.format(value, args);
 		} catch (Exception e) {
 			Skript.error("Invalid format string at '" + key + "' in the " + getName() + " language file: " + value);
 			return key;
@@ -136,7 +135,7 @@ public static String getSpaced(String key) {
 	 * @return a non-null String array with at least one element
 	 */
 	public static String[] getList(String key) {
-		String s = get_i("" + key.toLowerCase(Locale.ENGLISH));
+		String s = get_i(key.toLowerCase(Locale.ENGLISH));
 		if (s == null)
 			return new String[] {key.toLowerCase(Locale.ENGLISH)};
 		String[] r = listSplitPattern.split(s);
@@ -194,7 +193,7 @@ public static void loadDefault(SkriptAddon addon) {
 		}
 
 		Class<?> source = addon.source();
-		assert source != null; // getSanitizedLanguageDirectory call means source should not be null
+		assert source != null; // getSanitizedLanguageDirectory call means the source should not be null
 		try (
 			InputStream defaultIs = source.getResourceAsStream("/" + languageFileDirectory + "/default.lang");
 			InputStream englishIs = source.getResourceAsStream("/" + languageFileDirectory + "/english.lang")
@@ -302,7 +301,7 @@ private static boolean load(SkriptAddon addon, String name, boolean tryUpdate) {
 			Skript.error(addon + "'s language file " + name + ".lang does not provide a version number!");
 		} else {
 			try {
-				Version v = new Version("" + l.get("version"));
+				Version v = new Version(l.get("version"));
 				Version lv = langVersion.get(addon.name());
 				assert lv != null; // set in loadDefault()
 				if (v.isSmallerThan(lv))
@@ -333,7 +332,7 @@ private static Map<String, String> load(@Nullable InputStream in, String name, b
 		if (in == null)
 			return new HashMap<>();
 
-		try {
+		try (in) {
 			Config langConfig = new Config(in, name + ".lang", false, false, ":");
 
 			String langVersion = langConfig.getValue("version");
@@ -366,10 +365,6 @@ private static Map<String, String> load(@Nullable InputStream in, String name, b
 			//noinspection ThrowableNotThrown
 			Skript.exception(e, "Could not load the language file '" + name + ".lang': " + ExceptionUtils.toString(e));
 			return new HashMap<>();
-		} finally {
-			try {
-				in.close();
-			} catch (IOException ignored) { }
 		}
 	}
 
diff --git a/src/main/java/ch/njol/skript/skcommand/DisableCommand.java b/src/main/java/ch/njol/skript/skcommand/DisableCommand.java
new file mode 100644
index 00000000000..c0134b13671
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/DisableCommand.java
@@ -0,0 +1,101 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import ch.njol.skript.util.ExceptionUtils;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.lang.script.Script;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+public class DisableCommand extends SubCommand {
+
+	public DisableCommand() {
+		super("disable");
+	}
+
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		if (args[1].equalsIgnoreCase("all")) {
+			disableEverything(sender);
+		} else {
+			File scriptFile = ScriptCommand.getScriptFromArgs(sender, args);
+			if (scriptFile == null) // TODO allow disabling deleted/renamed scripts
+				return;
+
+			if (scriptFile.isDirectory()) {
+				disableFolder(sender, scriptFile);
+			} else {
+				disableSpecificScript(sender, scriptFile);
+			}
+
+		}
+
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return ScriptCommand.getScriptCommandTabCompletions(args);
+	}
+
+	// sk disable all
+	private static void disableEverything(CommandSender sender) {
+		ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
+		try {
+			ScriptCommand.toggleFiles(Skript.getInstance().getScriptsFolder(), false);
+			SkriptCommand.info(sender, "disable.all.disabled");
+		} catch (IOException e) {
+			SkriptCommand.error(sender, "disable.all.io error", ExceptionUtils.toString(e));
+		}
+	}
+
+	// sk disable script_name
+	private static void disableSpecificScript(CommandSender sender, File scriptFile) {
+		if (ScriptLoader.getDisabledScriptsFilter().accept(scriptFile)) {
+			String scriptName = scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH);
+			SkriptCommand.info(sender, "disable.single.already disabled", scriptName);
+			return;
+		}
+
+		Script script = ScriptLoader.getScript(scriptFile);
+		if (script != null) {
+			ScriptLoader.unloadScript(script);
+		}
+
+		String fileName = scriptFile.getName();
+
+		try {
+			ScriptCommand.toggleFile(scriptFile, false);
+		} catch (IOException e) {
+			SkriptCommand.error(sender, "disable.single.io error", scriptFile.getName(), ExceptionUtils.toString(e));
+			return;
+		}
+		SkriptCommand.info(sender, "disable.single.disabled", fileName);
+	}
+
+	// sk disable folder_name
+	private static void disableFolder(CommandSender sender, File scriptFolder) {
+		ScriptLoader.unloadScripts(ScriptLoader.getScripts(scriptFolder));
+
+		Set<File> scripts;
+		try {
+			scripts = ScriptCommand.toggleFiles(scriptFolder, false);
+		} catch (IOException e) {
+			SkriptCommand.error(sender, "disable.folder.io error", scriptFolder.getName(), ExceptionUtils.toString(e));
+			return;
+		}
+
+		if (scripts.isEmpty()) {
+			SkriptCommand.info(sender, "disable.folder.empty", scriptFolder.getName());
+			return;
+		}
+
+		SkriptCommand.info(sender, "disable.folder.disabled", scriptFolder.getName(), scripts.size());
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/EnableCommand.java b/src/main/java/ch/njol/skript/skcommand/EnableCommand.java
new file mode 100644
index 00000000000..53075c549cb
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/EnableCommand.java
@@ -0,0 +1,118 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.log.RedirectingLogHandler;
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import ch.njol.skript.util.ExceptionUtils;
+import ch.njol.util.StringUtils;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+public class EnableCommand extends SubCommand {
+
+	public EnableCommand() {
+		super("enable");
+	}
+
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		try (RedirectingLogHandler redirectingLogHandler = new RedirectingLogHandler(sender, "").start()) {
+			if (args[1].equalsIgnoreCase("all")) {
+				enableEverything(sender, redirectingLogHandler);
+			} else {
+				File scriptFile = ScriptCommand.getScriptFromArgs(sender, args);
+				if (scriptFile == null)
+					return;
+
+				if (scriptFile.isDirectory()) {
+					enableFolder(sender, redirectingLogHandler, scriptFile);
+				} else {
+					enableSpecificScript(sender, redirectingLogHandler, scriptFile, args);
+				}
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return ScriptCommand.getScriptCommandTabCompletions(args);
+	}
+
+	// sk enable all
+	private static void enableEverything(CommandSender sender, RedirectingLogHandler redirectingLogHandler) {
+		try {
+			SkriptCommand.info(sender, "enable.all.enabling");
+			ScriptLoader.loadScripts(ScriptCommand.toggleFiles(Skript.getInstance().getScriptsFolder(), true), redirectingLogHandler)
+				.thenAccept(scriptInfo -> {
+					if (redirectingLogHandler.numErrors() == 0) {
+						SkriptCommand.info(sender, "enable.all.enabled");
+					} else {
+						SkriptCommand.error(sender, "enable.all.error", redirectingLogHandler.numErrors());
+					}
+				});
+		} catch (IOException e) {
+			SkriptCommand.error(sender, "enable.all.io error", ExceptionUtils.toString(e));
+		}
+	}
+
+	// sk enable script_name
+	private static void enableSpecificScript(CommandSender sender, RedirectingLogHandler redirectingLogHandler, File scriptFile, String[] args) {
+		if (ScriptLoader.getLoadedScriptsFilter().accept(scriptFile)) {
+			SkriptCommand.info(sender, "enable.single.already enabled", scriptFile.getName(), StringUtils.join(args, " ", 1, args.length));
+			return;
+		}
+
+		try {
+			scriptFile = ScriptCommand.toggleFile(scriptFile, true);
+		} catch (IOException e) {
+			String scriptName = scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH);
+			SkriptCommand.error(sender, "enable.single.io error", scriptName, ExceptionUtils.toString(e));
+			return;
+		}
+
+		String fileName = scriptFile.getName();
+		SkriptCommand.info(sender, "enable.single.enabling", fileName);
+		ScriptLoader.loadScripts(scriptFile, redirectingLogHandler)
+			.thenAccept(scriptInfo -> {
+				if (redirectingLogHandler.numErrors() == 0) {
+					SkriptCommand.info(sender, "enable.single.enabled", fileName);
+				} else {
+					SkriptCommand.error(sender, "enable.single.error", fileName, redirectingLogHandler.numErrors());
+				}
+			});
+	}
+
+	// sk enable folder_name
+	private static void enableFolder(CommandSender sender, RedirectingLogHandler redirectingLogHandler, File scriptFolder) {
+		Set<File> scriptFiles;
+		try {
+			scriptFiles = ScriptCommand.toggleFiles(scriptFolder, true);
+		} catch (IOException e) {
+			SkriptCommand.error(sender, "enable.folder.io error", scriptFolder.getName(), ExceptionUtils.toString(e));
+			return;
+		}
+
+		if (scriptFiles.isEmpty()) {
+			SkriptCommand.info(sender, "enable.folder.empty", scriptFolder.getName());
+			return;
+		}
+
+		String fileName = scriptFolder.getName();
+		SkriptCommand.info(sender, "enable.folder.enabling", fileName, scriptFiles.size());
+		ScriptLoader.loadScripts(scriptFiles, redirectingLogHandler)
+			.thenAccept(scriptInfo -> {
+				if (redirectingLogHandler.numErrors() == 0) {
+					SkriptCommand.info(sender, "enable.folder.enabled", fileName, scriptInfo.files);
+				} else {
+					SkriptCommand.error(sender, "enable.folder.error", fileName, redirectingLogHandler.numErrors());
+				}
+			});
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/GenDocsCommand.java b/src/main/java/ch/njol/skript/skcommand/GenDocsCommand.java
new file mode 100644
index 00000000000..a056a6908d7
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/GenDocsCommand.java
@@ -0,0 +1,48 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Documentation;
+import ch.njol.skript.doc.HTMLGenerator;
+import ch.njol.skript.doc.JSONGenerator;
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.List;
+
+public class GenDocsCommand extends SubCommand {
+
+	public GenDocsCommand() {
+		super("gen-docs");
+	}
+
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		File templateDir = Documentation.getDocsTemplateDirectory();
+		File outputDir = Documentation.getDocsOutputDirectory();
+		if (!outputDir.mkdirs()) {
+			Skript.warning("Could not create output directory: " + outputDir);
+			return;
+		}
+
+		Skript.info(sender, "Generating docs...");
+		JSONGenerator jsonGenerator = new JSONGenerator(templateDir, outputDir);
+		jsonGenerator.generate();
+
+		if (!templateDir.exists()) {
+			Skript.info(sender, "JSON-only documentation generated!");
+			return;
+		}
+
+		HTMLGenerator htmlGenerator = new HTMLGenerator(templateDir, outputDir);
+		htmlGenerator.generate(); // Try to generate docs... hopefully
+		Skript.info(sender, "All documentation generated!");
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return List.of();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/HelpCommand.java b/src/main/java/ch/njol/skript/skcommand/HelpCommand.java
new file mode 100644
index 00000000000..2122afda1fd
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/HelpCommand.java
@@ -0,0 +1,26 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class HelpCommand extends SubCommand {
+
+	public HelpCommand() {
+		super("help");
+	}
+
+	// TODO
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		sender.sendMessage("help");
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return List.of("help");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/ListCommand.java b/src/main/java/ch/njol/skript/skcommand/ListCommand.java
new file mode 100644
index 00000000000..9017dfd5af3
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/ListCommand.java
@@ -0,0 +1,60 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ListCommand extends SubCommand {
+
+	public ListCommand() {
+		super("list", "show");
+	}
+
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		SkriptCommand.info(sender, "list.enabled.header");
+		ScriptLoader.getLoadedScripts().stream()
+			.map(script -> script.getConfig().getFileName())
+			.forEach(name -> SkriptCommand.info(sender, "list.enabled.element", name));
+
+		SkriptCommand.info(sender, "list.disabled.header");
+		ScriptLoader.getDisabledScripts().stream()
+			.flatMap(file -> {
+				if (file.isDirectory()) {
+					return getSubFiles(file).stream();
+				}
+				return Arrays.stream(new File[]{file});
+			})
+			.map(File::getPath)
+			.map(path -> path.substring(Skript.getInstance().getScriptsFolder().getPath().length() + 1))
+			.forEach(path -> SkriptCommand.info(sender, "list.disabled.element", path));
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return List.of();
+	}
+
+	private static List<File> getSubFiles(File file) {
+		List<File> files = new ArrayList<>();
+		if (file.isDirectory()) {
+			//noinspection ConstantConditions
+			for (File listFile : file.listFiles(f -> !f.isHidden())) {
+				if (listFile.isDirectory()) {
+					files.addAll(getSubFiles(listFile));
+				} else if (listFile.getName().endsWith(".sk")) {
+					files.add(listFile);
+				}
+			}
+		}
+		return files;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/ReloadCommand.java b/src/main/java/ch/njol/skript/skcommand/ReloadCommand.java
new file mode 100644
index 00000000000..0544ddf5a86
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/ReloadCommand.java
@@ -0,0 +1,184 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptConfig;
+import ch.njol.skript.aliases.Aliases;
+import ch.njol.skript.localization.ArgsMessage;
+import ch.njol.skript.localization.Language;
+import ch.njol.skript.localization.PluralizingArgsMessage;
+import ch.njol.skript.log.LogEntry;
+import ch.njol.skript.log.RedirectingLogHandler;
+import ch.njol.skript.log.TimingLogHandler;
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import ch.njol.skript.util.Utils;
+import ch.njol.util.OpenCloseable;
+import ch.njol.util.StringUtils;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.lang.script.Script;
+
+import java.io.File;
+import java.util.List;
+import java.util.logging.Level;
+
+public class ReloadCommand extends SubCommand {
+
+	public ReloadCommand() {
+		super("reload");
+	}
+
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		try (
+			RedirectingLogHandler redirectingLogHandler = new RedirectingLogHandler(sender, "").start();
+			TimingLogHandler timingLogHandler = new TimingLogHandler().start()
+		) {
+			if (args[1].equalsIgnoreCase("all")) {
+				reloadEverything(sender, redirectingLogHandler, timingLogHandler);
+			} else if (args[1].equalsIgnoreCase("scripts")) {
+				reloadScripts(sender, redirectingLogHandler, timingLogHandler);
+			} else if (args[1].equalsIgnoreCase("config")) {
+				reloadConfig(sender, redirectingLogHandler, timingLogHandler);
+			} else if (args[1].equalsIgnoreCase("aliases")) {
+				reloadAliases(sender, redirectingLogHandler, timingLogHandler);
+			} else { // Reloading an individual script or folder
+				reloadSpecific(sender, args, redirectingLogHandler, timingLogHandler);
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return ScriptCommand.getScriptCommandTabCompletions(args);
+	}
+
+	// sk reload all
+	private static void reloadEverything(CommandSender sender, RedirectingLogHandler redirectingLogHandler, TimingLogHandler timingLogHandler) {
+		reloading(sender, "config, aliases and scripts", redirectingLogHandler);
+		SkriptConfig.load();
+		Aliases.clear();
+		Aliases.loadAsync().thenRun(() -> {
+			ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
+			ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(redirectingLogHandler, timingLogHandler))
+				.thenAccept(info -> {
+					if (info.files == 0)
+						Skript.warning(Skript.m_no_scripts.toString());
+					reloaded(sender, redirectingLogHandler, timingLogHandler, "config, aliases and scripts");
+				});
+		});
+	}
+
+	// sk reload scripts
+	private static void reloadScripts(CommandSender sender, RedirectingLogHandler redirectingLogHandler, TimingLogHandler timingLogHandler) {
+		reloading(sender, "scripts", redirectingLogHandler);
+
+		ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
+		ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(redirectingLogHandler, timingLogHandler))
+			.thenAccept(info -> {
+				if (info.files == 0)
+					Skript.warning(Skript.m_no_scripts.toString());
+				reloaded(sender, redirectingLogHandler, timingLogHandler, "scripts");
+			});
+	}
+
+	// sk reload config
+	private static void reloadConfig(CommandSender sender, RedirectingLogHandler redirectingLogHandler, TimingLogHandler timingLogHandler) {
+		reloading(sender, "main config", redirectingLogHandler);
+		SkriptConfig.load();
+		reloaded(sender, redirectingLogHandler, timingLogHandler, "main config");
+	}
+
+	// sk reload aliases
+	private static void reloadAliases(CommandSender sender, RedirectingLogHandler redirectingLogHandler, TimingLogHandler timingLogHandler) {
+		reloading(sender, "aliases", redirectingLogHandler);
+		Aliases.clear();
+		Aliases.loadAsync().thenRun(() -> reloaded(sender, redirectingLogHandler, timingLogHandler, "aliases"));
+	}
+
+	// sk reload script_name
+	// sk reload folder_name
+	private static void reloadSpecific(CommandSender sender, String[] args, RedirectingLogHandler redirectingLogHandler, TimingLogHandler timingLogHandler) {
+		File scriptFile = ScriptCommand.getScriptFromArgs(sender, args);
+		if (scriptFile == null)
+			return;
+
+		if (!scriptFile.isDirectory()) {
+			if (ScriptLoader.getDisabledScriptsFilter().accept(scriptFile)) {
+				info(sender, "reload.script disabled", scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH), StringUtils.join(args, " ", 1, args.length));
+				return;
+			}
+
+			reloading(sender, "script", redirectingLogHandler, scriptFile.getName());
+
+			Script script = ScriptLoader.getScript(scriptFile);
+			if (script != null) {
+				ScriptLoader.unloadScript(script);
+			}
+
+			ScriptLoader.loadScripts(scriptFile, OpenCloseable.combine(redirectingLogHandler, timingLogHandler))
+				.thenAccept(scriptInfo ->
+					reloaded(sender, redirectingLogHandler, timingLogHandler, "script", scriptFile.getName())
+				);
+		} else {
+			String fileName = scriptFile.getName();
+			reloading(sender, "scripts in folder", redirectingLogHandler, fileName);
+			ScriptLoader.unloadScripts(ScriptLoader.getScripts(scriptFile));
+			ScriptLoader.loadScripts(scriptFile, OpenCloseable.combine(redirectingLogHandler, timingLogHandler))
+				.thenAccept(scriptInfo -> {
+					if (scriptInfo.files == 0) {
+						info(sender, "reload.empty folder", fileName);
+					} else {
+						if (redirectingLogHandler.numErrors() == 0) {
+							reloaded(sender, redirectingLogHandler, timingLogHandler, "x scripts in folder success", fileName, scriptInfo.files);
+						} else {
+							reloaded(sender, redirectingLogHandler, timingLogHandler, "x scripts in folder error", fileName, scriptInfo.files);
+						}
+					}
+				});
+		}
+	}
+
+	// Messages
+	private static final ArgsMessage RELOADING_MESSAGE = new ArgsMessage(SkriptCommand.CONFIG_NODE + ".reload.reloading");
+	private static final ArgsMessage RELOADED_MESSAGE = new ArgsMessage(SkriptCommand.CONFIG_NODE + ".reload.reloaded");
+	private static final ArgsMessage RELOAD_ERROR_MESSAGE = new ArgsMessage(SkriptCommand.CONFIG_NODE + ".reload.error");
+
+	private static void reloading(CommandSender sender, String what, RedirectingLogHandler logHandler, Object... args) {
+		what = args.length == 0
+			? Language.get(SkriptCommand.CONFIG_NODE + ".reload." + what)
+			: Language.format(SkriptCommand.CONFIG_NODE + ".reload." + what, args);
+
+		String message = StringUtils.fixCapitalization(RELOADING_MESSAGE.toString(what));
+		Skript.info(sender, message);
+
+		// Log reloading message
+		String text = Language.format(SkriptCommand.CONFIG_NODE + ".reload." + "player reload", sender.getName(), what);
+		logHandler.log(new LogEntry(Level.INFO, Utils.replaceEnglishChatStyles(text)), sender);
+	}
+
+	private static void reloaded(CommandSender sender, RedirectingLogHandler logHandler, TimingLogHandler timingLogHandler, String what, Object... args) {
+		what = args.length == 0
+			? Language.get(SkriptCommand.CONFIG_NODE + ".reload." + what)
+			: PluralizingArgsMessage.format(Language.format(SkriptCommand.CONFIG_NODE + ".reload." + what, args));
+
+		String timeTaken = String.valueOf(timingLogHandler.getTimeTaken());
+		String message;
+
+		if (logHandler.numErrors() == 0) {
+			message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(RELOADED_MESSAGE.toString(what, timeTaken)));
+			logHandler.log(new LogEntry(Level.INFO, Utils.replaceEnglishChatStyles(message)));
+		} else {
+			message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(RELOAD_ERROR_MESSAGE.toString(what, logHandler.numErrors(), timeTaken)));
+			logHandler.log(new LogEntry(Level.SEVERE, Utils.replaceEnglishChatStyles(message)));
+		}
+	}
+
+	private static void info(CommandSender sender, String what, Object... args) {
+		what = args.length == 0
+			? Language.get(SkriptCommand.CONFIG_NODE + "." + what)
+			: PluralizingArgsMessage.format(Language.format(SkriptCommand.CONFIG_NODE + "." + what, args));
+		Skript.info(sender, StringUtils.fixCapitalization(what));
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/ScriptCommand.java b/src/main/java/ch/njol/skript/skcommand/ScriptCommand.java
new file mode 100644
index 00000000000..01a19c48761
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/ScriptCommand.java
@@ -0,0 +1,161 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.localization.ArgsMessage;
+import ch.njol.skript.test.runner.TestMode;
+import ch.njol.skript.util.FileUtils;
+import ch.njol.util.StringUtils;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+/**
+ * Utilities for {@link ch.njol.skript.skcommand.SkriptCommand.SubCommand}s that involve scripts.
+ */
+public class ScriptCommand {
+
+	private static final ArgsMessage INVALID_SCRIPT_MESSAGE = new ArgsMessage(SkriptCommand.CONFIG_NODE + ".invalid script");
+	private static final ArgsMessage INVALID_FOLDER_MESSAGE = new ArgsMessage(SkriptCommand.CONFIG_NODE + ".invalid folder");
+
+	public static @Nullable File getScriptFromArgs(CommandSender sender, String[] args) {
+		return getScriptFromArgs(sender, args, Skript.getInstance().getScriptsFolder());
+	}
+
+	public static @Nullable File getScriptFromArgs(CommandSender sender, String[] args, File directoryFile) {
+		String script = StringUtils.join(args, " ", 1, args.length);
+		File f = ScriptLoader.getScriptFromName(script, directoryFile);
+		if (f == null) {
+			// Always allow '/' and '\' regardless of OS
+			boolean isDirectory = script.endsWith("/") || script.endsWith("\\") || script.endsWith(File.separator);
+			Skript.error(sender, (isDirectory ? INVALID_FOLDER_MESSAGE : INVALID_SCRIPT_MESSAGE).toString(script));
+			return null;
+		}
+		return f;
+	}
+
+	/**
+	 * Gets tab completions for script commands such as /sk enable|reload|disable
+	 *
+	 * @param args Args of the SubCommand
+	 * @return A list of directories and Skript files.
+	 */
+	public static List<String> getScriptCommandTabCompletions(String[] args) {
+		List<String> options = new ArrayList<>();
+
+		boolean useTestDirectory = args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE;
+		File scripts = useTestDirectory ? TestMode.TEST_DIR.toFile() : Skript.getInstance().getScriptsFolder();
+		String scriptsPathString = scripts.toPath().toString();
+		int scriptsPathLength = scriptsPathString.length();
+
+		// support for scripts with spaces in them
+		String scriptArg = StringUtils.join(args, " ", 1, args.length);
+		String fs = File.separator;
+
+		boolean enable = args[0].equalsIgnoreCase("enable");
+
+		// Live update, this will get all old and new (even not loaded) scripts
+		// TODO Find a better way for caching, it isn't exactly ideal to be calling this method constantly
+		// TODO Make a cache based on last modified date of the 'scripts' folder?
+		try (Stream<Path> files = Files.walk(scripts.toPath())) {
+			files.map(Path::toFile)
+				.forEach(file -> {
+					if (!(enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter()).accept(file))
+						return;
+
+					// Ignore hidden files like .git/ for users that use git source control.
+					if (file.isHidden())
+						return;
+
+					String fileString = file.toString().substring(scriptsPathLength);
+					if (fileString.isEmpty())
+						return;
+
+					if (file.isDirectory()) {
+						fileString = fileString + fs; // Add file separator at the end of directories
+					} else if (file.getParentFile().toPath().toString().equals(scriptsPathString)) {
+						fileString = fileString.substring(1); // Remove file separator from the beginning of files or directories in root only
+						if (fileString.isEmpty())
+							return;
+					}
+
+					// Make sure the user's argument matches with the file's name or beginning of file path
+					if (!scriptArg.isEmpty() && !file.getName().startsWith(scriptArg) && !fileString.startsWith(scriptArg))
+						return;
+
+					// Trim off previous arguments if needed
+					if (args.length > 2 && fileString.length() >= scriptArg.length())
+						fileString = fileString.substring(scriptArg.lastIndexOf(" ") + 1);
+
+					// Just in case
+					if (fileString.isEmpty())
+						return;
+
+					options.add(fileString);
+				});
+		} catch (Exception e) {
+			//noinspection ThrowableNotThrown
+			Skript.exception(e, "An error occurred while trying to update the list of disabled scripts!");
+		}
+
+		// These will be added even if there are incomplete script arg
+		if (args.length == 2) {
+			options.add("all");
+			if (args[0].equalsIgnoreCase("reload")) {
+				options.add("config");
+				options.add("aliases");
+				options.add("scripts");
+			}
+		}
+		return options;
+	}
+
+	public static File toggleFile(File file, boolean enable) throws IOException {
+		if (enable) {
+			return FileUtils.move(
+				file,
+				new File(file.getParentFile(), file.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH)),
+				false
+			);
+		}
+		return FileUtils.move(
+			file,
+			new File(file.getParentFile(), ScriptLoader.DISABLED_SCRIPT_PREFIX + file.getName()),
+			false
+		);
+	}
+
+	public static Set<File> toggleFiles(File folder, boolean enable) throws IOException {
+		FileFilter filter = enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter();
+
+		Set<File> changed = new HashSet<>();
+		//noinspection ConstantConditions
+		for (File file : folder.listFiles()) {
+			if (file.isDirectory()) {
+				changed.addAll(toggleFiles(file, enable));
+			} else {
+				if (filter.accept(file)) {
+					String fileName = file.getName();
+					changed.add(FileUtils.move(
+						file,
+						new File(file.getParentFile(), enable ? fileName.substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH) : ScriptLoader.DISABLED_SCRIPT_PREFIX + fileName),
+						false
+					));
+				}
+			}
+		}
+
+		return changed;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/SkriptCommand.java b/src/main/java/ch/njol/skript/skcommand/SkriptCommand.java
new file mode 100644
index 00000000000..71c22252c18
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/SkriptCommand.java
@@ -0,0 +1,154 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Documentation;
+import ch.njol.skript.localization.Language;
+import ch.njol.skript.localization.PluralizingArgsMessage;
+import ch.njol.skript.test.runner.TestMode;
+import ch.njol.util.StringUtils;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+public class SkriptCommand implements TabExecutor {
+
+	public static final String CONFIG_NODE = "skript command";
+
+	private static final Set<SubCommand> SUB_COMMANDS;
+	private static final List<String> ALIASES;
+
+	static {
+		SUB_COMMANDS = new HashSet<>(Arrays.asList(
+			new HelpCommand(),
+			new ReloadCommand(),
+			new EnableCommand(),
+			new DisableCommand(),
+			new ListCommand()
+		));
+
+		// add a command to generate documentation
+		if (TestMode.GEN_DOCS || Documentation.isDocsTemplateFound()) {
+			SUB_COMMANDS.add(new GenDocsCommand());
+		}
+
+		// add a command to run individual tests
+		if (TestMode.DEV_MODE) {
+			SUB_COMMANDS.add(new TestCommand());
+		}
+
+		// cache subcommand aliases for tab completions
+		ALIASES = new ArrayList<>();
+
+		for (SubCommand subCommand : SUB_COMMANDS) {
+			ALIASES.addAll(Arrays.asList(subCommand.getAliases()));
+		}
+	}
+
+	/**
+	 * Gets a SubCommand by its alias
+	 * @param alias The alias
+	 * @return The SubCommand or null if no such alias exists
+	 */
+	private SubCommand findSubCommand(String alias) {
+		for (SubCommand subCommand : SUB_COMMANDS) {
+			for (String subCommandAlias : subCommand.getAliases()) {
+				if (subCommandAlias.equalsIgnoreCase(alias)) {
+					return subCommand;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @return All aliases of all subcommands.
+	 */
+	public static List<String> getAllAliases() {
+		return ALIASES;
+	}
+
+	public static void info(CommandSender sender, String what, Object... args) {
+		what = args.length == 0
+			? Language.get(CONFIG_NODE + "." + what)
+			: PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args));
+		Skript.info(sender, StringUtils.fixCapitalization(what));
+	}
+
+	public static void error(CommandSender sender, String what, Object... args) {
+		what = args.length == 0
+			? Language.get(CONFIG_NODE + "." + what)
+			: PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args));
+		Skript.error(sender, StringUtils.fixCapitalization(what));
+	}
+
+	@Override
+	public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
+							 @NotNull String @NotNull [] args) {
+		SubCommand subCommand = null;
+
+		if (args.length > 0) {
+			subCommand = findSubCommand(args[0]);
+		}
+
+		if (subCommand == null) {
+			// TODO - send unknown command text
+			sender.sendMessage("unknown command");
+			return true;
+		}
+
+		subCommand.execute(sender, args);
+		return true;
+	}
+
+	@Override
+	public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
+												@NotNull String @NotNull [] args) {
+		if (args.length == 0 || args[0].isEmpty()) {
+			return getAllAliases();
+		}
+
+		SubCommand subCommand = findSubCommand(args[0]);
+		if (subCommand == null) {
+			return List.of();
+		}
+
+		return subCommand.getTabCompletions(sender, args);
+	}
+
+	/**
+	 * Represents a subcommand of the /sk command, like /sk reload
+	 */
+	public static abstract class SubCommand {
+
+		private final String[] aliases;
+
+		public SubCommand(String... aliases) {
+			this.aliases = aliases;
+		}
+
+		public String[] getAliases() {
+			return aliases;
+		}
+
+		/**
+		 * Executes this SubCommand
+		 * @param sender Source of the command
+		 * @param args The arguments
+		 */
+		public abstract void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args);
+
+		/**
+		 * Returns the tab completions for this SubCommand
+		 * @param sender Source of the command
+		 * @param args The arguments
+		 * @return The tab completions
+		 */
+		public abstract List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args);
+
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/TestCommand.java b/src/main/java/ch/njol/skript/skcommand/TestCommand.java
new file mode 100644
index 00000000000..05e0531354b
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/TestCommand.java
@@ -0,0 +1,91 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.log.TestingLogHandler;
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import ch.njol.skript.test.runner.SkriptTestEvent;
+import ch.njol.skript.test.runner.TestMode;
+import ch.njol.skript.test.runner.TestTracker;
+import ch.njol.skript.test.utils.TestResults;
+import com.google.gson.GsonBuilder;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.logging.Level;
+
+public class TestCommand extends SubCommand {
+
+	public TestCommand() {
+		super("test");
+	}
+
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		File scriptFile;
+		if (args.length == 1) {
+			scriptFile = TestMode.lastTestFile;
+			if (scriptFile == null) {
+				Skript.error(sender, "No test script has been run yet!");
+				return;
+			}
+		} else {
+			if (args[1].equalsIgnoreCase("all")) {
+				scriptFile = TestMode.TEST_DIR.toFile();
+			} else {
+				scriptFile = ScriptCommand.getScriptFromArgs(sender, args, TestMode.TEST_DIR.toFile());
+				TestMode.lastTestFile = scriptFile;
+			}
+		}
+
+		if (scriptFile == null || !scriptFile.exists()) {
+			Skript.error(sender, "Test script doesn't exist!");
+			return;
+		}
+
+		// Close previous loggers before we create a new one
+		// This prevents closing logger errors
+		// timingLogHandler.close();
+		// logHandler.close();
+
+		TestingLogHandler errorCounter = new TestingLogHandler(Level.SEVERE).start();
+		ScriptLoader.loadScripts(scriptFile, errorCounter)
+			.thenAccept(scriptInfo ->
+				// Code should run on server thread
+				Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> {
+					Bukkit.getPluginManager().callEvent(new SkriptTestEvent()); // Run it
+					ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
+
+					// Get results and show them
+					TestResults testResults = TestTracker.collectResults();
+					String[] lines = testResults.createReport().split("\n");
+					for (String line : lines) {
+						Skript.info(sender, line);
+					}
+
+					// Log results to file
+					Skript.info(sender, "Collecting results to " + TestMode.RESULTS_FILE);
+					String results = new GsonBuilder()
+						.setPrettyPrinting() // Easier to read lines
+						.disableHtmlEscaping() // Fixes issue with "'" character in test strings going Unicode
+						.create().toJson(testResults);
+					try {
+						Files.writeString(TestMode.RESULTS_FILE, results);
+					} catch (IOException e) {
+						Skript.exception(e, "Failed to write test results.");
+					}
+				})
+			);
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return ScriptCommand.getScriptCommandTabCompletions(args);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/skcommand/UpdateCommand.java b/src/main/java/ch/njol/skript/skcommand/UpdateCommand.java
new file mode 100644
index 00000000000..981e6c416e4
--- /dev/null
+++ b/src/main/java/ch/njol/skript/skcommand/UpdateCommand.java
@@ -0,0 +1,25 @@
+package ch.njol.skript.skcommand;
+
+import ch.njol.skript.skcommand.SkriptCommand.SubCommand;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class UpdateCommand extends SubCommand {
+
+	public UpdateCommand() {
+		super("update");
+	}
+
+	// TODO
+	@Override
+	public void execute(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		sender.sendMessage("update");
+	}
+
+	@Override
+	public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
+		return List.of("update");
+	}
+}