diff --git a/src/main/java/com/drtshock/playervaults/Main.java b/src/main/java/com/drtshock/playervaults/Main.java
index eb81a25..d135da4 100644
--- a/src/main/java/com/drtshock/playervaults/Main.java
+++ b/src/main/java/com/drtshock/playervaults/Main.java
@@ -29,6 +29,7 @@ public class Main extends JavaPlugin {
 
 	@Override
 	public void onEnable() {
+		transferVaults();
 		loadLang();
 		log = getServer().getLogger();
 		getServer().getPluginManager().registerEvents(new Listeners(this), this);
@@ -50,6 +51,25 @@ public class Main extends JavaPlugin {
 		getCommand("pvdel").setExecutor(commands);
 		setupEconomy();
 	}
+	
+	public void transferVaults() {
+		File f = new File(getDataFolder(),"vaults.yml");
+		if(f.exists() && !new File(getDataFolder(), "vaults").exists()) {
+			YamlConfiguration vaults = YamlConfiguration.loadConfiguration(f);
+			for(String key:vaults.getKeys(false)) {
+				YamlConfiguration newPerson = new YamlConfiguration();
+				for(String key2:vaults.getConfigurationSection(key).getKeys(false)) {
+					newPerson.set(key2, vaults.getString(key+"."+key2));
+				}
+				try {
+					newPerson.save(new File(getDataFolder()+File.separator+"vaults"+File.separator+key+".yml"));
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			getLogger().warning("Found old storage format used! Converting to new format!");
+		}
+	}
 
 	public void startMetrics() {
 		try {
diff --git a/plugin.yml b/src/main/resources/plugin.yml
similarity index 94%
rename from plugin.yml
rename to src/main/resources/plugin.yml
index eacc97c..fff98d4 100644
--- a/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ main: com.drtshock.playervaults.Main
 authors: [drtshock, gomeow, chester]
 version: 2.1.1
 website: http://dev.bukkit.org/server-mods/PlayerVaults
-softdepend: Vault
+softdepend: [Vault]
 commands:
   pv:
     description: Open a vault with /vault <number>