diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
index 853b435..06fa821 100644
--- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java
+++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
@@ -24,6 +24,7 @@ import com.drtshock.playervaults.tasks.UUIDConversion;
 import com.drtshock.playervaults.util.Lang;
 import com.drtshock.playervaults.util.Metrics;
 import com.drtshock.playervaults.util.Updater;
+import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager;
 import com.drtshock.playervaults.vaultmanagement.VaultManager;
 import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
 import net.milkbowl.vault.economy.Economy;
@@ -68,8 +69,10 @@ public class PlayerVaults extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        PLUGIN = this;
         getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary.
         loadLang();
+        new UUIDVaultManager();
         LOG = getServer().getLogger();
         getServer().getPluginManager().registerEvents(listener = new Listeners(this), this);
         loadConfig();
diff --git a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
index 18d5b6d..b2e66c9 100644
--- a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
+++ b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
@@ -2,7 +2,6 @@ package com.drtshock.playervaults.tasks;
 
 import com.drtshock.playervaults.PlayerVaults;
 import net.minecraft.util.org.apache.commons.io.FileUtils;
-import net.minecraft.util.org.apache.commons.io.FilenameUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -19,23 +18,26 @@ public final class UUIDConversion extends BukkitRunnable {
 
     @Override
     public void run() {
-        if (new File(PlayerVaults.PLUGIN.getDataFolder(), "uuidvaults").exists()) {
+        File newDir = new File(PlayerVaults.PLUGIN.getDataFolder(), "uuidvaults");
+        if (newDir.exists()) {
             PlayerVaults.LOG.log(Level.INFO, "Files already converted to UUID.");
             return;
         }
+        newDir.mkdirs();
 
         PlayerVaults.LOG.log(Level.INFO, "********** Starting PlayerVault conversion to UUIDs **********");
         PlayerVaults.LOG.log(Level.INFO, "This might take awhile.");
         PlayerVaults.LOG.log(Level.INFO, "plugins/PlayerVaults/vaults will still be there as a backup but unused.");
 
         for (File file : new File(PlayerVaults.PLUGIN.getDataFolder() + File.separator + "vaults").listFiles()) {
-            OfflinePlayer player = Bukkit.getOfflinePlayer(FilenameUtils.removeExtension(file.toString()).replace(".yml", ""));
+            if (file.isDirectory()) break; // backups folder.
+            OfflinePlayer player = Bukkit.getOfflinePlayer(file.getName().replace(".yml", ""));
             if (player == null) {
                 PlayerVaults.LOG.log(Level.WARNING, "Unable to convert file because player never joined the server: " + file.getName());
                 break;
             }
             UUID uuid = player.getUniqueId();
-            File newFile = new File(PlayerVaults.PLUGIN.getDataFolder(), "uuidvaults" + uuid.toString() + ".yml");
+            File newFile = new File(PlayerVaults.PLUGIN.getDataFolder(), "uuidvaults" + File.separator + uuid.toString() + ".yml");
             file.mkdirs();
             try {
                 FileUtils.copyFile(file, newFile);