diff --git a/.gitignore b/.gitignore
index a9b02c73..cb9e357f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ crashlytics-build.properties
 # Hide Unfinished Project Files
 /SubServers.Client/Windows/
 /Artifacts/SubServers.Web.jar
+/SubServers.Velocity/
 /SubServers.Web/
 
 # Hide Others
diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index c0c4a989..e1c37a54 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -78,14 +78,11 @@
                                 <mkdir dir="${project.build.directory}" />
                                 <copy file="${basedir}/../LICENSE" todir="${project.build.directory}/classes" />
                                 <copy file="${basedir}/../Artifacts/SubServers.Client.jar" tofile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/client.jar" />
-                                <zip basedir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip" includes="Forge/*" />
-                                <delete dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge" />
-                                <zip basedir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip" includes="Spigot/*" />
-                                <delete dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot" />
-                                <zip basedir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip" includes="Sponge/*" />
-                                <delete dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge" />
-                                <zip basedir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip" includes="Vanilla/*" />
-                                <delete dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla" />
+                                <mkdir dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" />
+                                <zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip" includes="Forge/*" />
+                                <zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip" includes="Spigot/*" />
+                                <zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip" includes="Sponge/*" />
+                                <zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip" includes="Vanilla/*" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java
index 5ddc9677..c4a6a3c8 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java
@@ -333,7 +333,7 @@ public class YAMLSection {
      */
     public YAMLValue get(String handle) {
         if (Util.isNull(handle)) throw new NullPointerException();
-        return (map.get(handle) != null)?(new YAMLValue(map.get(handle), this, handle, yaml)):null;
+        return new YAMLValue(map.get(handle), this, handle, yaml);
     }
 
     /**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
index de5986da..971d6717 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
@@ -88,7 +88,7 @@ public final class SubCommand extends CommandX {
                                 javaarch = System.getProperty("sun.arch.data.model");
                     }
 
-                    sender.sendMessage("SubServers > These are the platforms and versions that are running SubServers.Sync:");
+                    sender.sendMessage("SubServers > These are the platforms and versions that are running SubServers.Bungee:");
                     sender.sendMessage("  " + System.getProperty("os.name") + ((!System.getProperty("os.name").toLowerCase().startsWith("windows"))?' ' + System.getProperty("os.version"):"") + ((osarch != null)?" [" + osarch + ']':"") + ',');
                     sender.sendMessage("  Java " + System.getProperty("java.version") + ((javaarch != null)?" [" + javaarch + ']':"") + ',');
                     sender.sendMessage("  " + plugin.getBungeeName() + ((plugin.isPatched)?" [Patched] ":" ") + net.md_5.bungee.Bootstrap.class.getPackage().getImplementationVersion() + ',');
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
index a06ec3a2..98cef728 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
@@ -57,7 +57,7 @@ public final class SubPlugin extends BungeeCord implements Listener {
     public final SubAPI api = new SubAPI(this);
     public SubDataServer subdata = null;
     public SubServer sudo = null;
-    public static final Version version = Version.fromString("2.13.2a");
+    public static final Version version = Version.fromString("2.13.2b");
 
     public Proxy redis = null;
     public boolean canSudo = false;
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Config/YAMLSection.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Config/YAMLSection.java
index 572ef3ea..9be65a60 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Config/YAMLSection.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Config/YAMLSection.java
@@ -335,7 +335,7 @@ public class YAMLSection {
      */
     public YAMLValue get(String handle) {
         if (Util.isNull(handle)) throw new NullPointerException();
-        return (map.get(handle) != null)?(new YAMLValue(map.get(handle), this, handle, yaml)):null;
+        return new YAMLValue(map.get(handle), this, handle, yaml);
     }
 
     /**
diff --git a/SubServers.Client/Bukkit/src/plugin.yml b/SubServers.Client/Bukkit/src/plugin.yml
index 8c021715..e7a04366 100644
--- a/SubServers.Client/Bukkit/src/plugin.yml
+++ b/SubServers.Client/Bukkit/src/plugin.yml
@@ -1,6 +1,6 @@
 name: 'SubServers-Client-Bukkit'
 main: 'net.ME1312.SubServers.Client.Bukkit.SubPlugin'
-version: '2.13.2a'
+version: '2.13.2b'
 authors: [ME1312]
 softdepend: [Vault, TitleManager]
 website: 'https://github.com/ME1312/SubServers-2'
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Config/YAMLSection.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Config/YAMLSection.java
index f23f6003..af16ebba 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Config/YAMLSection.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Config/YAMLSection.java
@@ -335,7 +335,7 @@ public class YAMLSection {
      */
     public YAMLValue get(String handle) {
         if (Util.isNull(handle)) throw new NullPointerException();
-        return (map.get(handle) != null)?(new YAMLValue(map.get(handle), this, handle, yaml)):null;
+        return new YAMLValue(map.get(handle), this, handle, yaml);
     }
 
     /**
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
index 11fa612f..89d4d4af 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * SubServers Client Plugin Class
  */
-@Plugin(id = "subservers-client-sponge", name = "SubServers-Client-Sponge", authors = "ME1312", version = "2.13.2a", url = "https://github.com/ME1312/SubServers-2", description = "Access your SubServers from Anywhere")
+@Plugin(id = "subservers-client-sponge", name = "SubServers-Client-Sponge", authors = "ME1312", version = "2.13.2b", url = "https://github.com/ME1312/SubServers-2", description = "Access your SubServers from Anywhere")
 public final class SubPlugin {
     protected NamedContainer<Long, Map<String, Map<String, String>>> lang = null;
     public YAMLConfig config;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/build.sh b/SubServers.Creator/src/Forge/build.sh
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/build.sh
rename to SubServers.Creator/src/Forge/build.sh
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/config/sponge/global.conf b/SubServers.Creator/src/Forge/config/sponge/global.conf
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/config/sponge/global.conf
rename to SubServers.Creator/src/Forge/config/sponge/global.conf
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/eula.txt b/SubServers.Creator/src/Forge/eula.txt
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/eula.txt
rename to SubServers.Creator/src/Forge/eula.txt
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/server.properties b/SubServers.Creator/src/Forge/server.properties
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/server.properties
rename to SubServers.Creator/src/Forge/server.properties
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/subservers.client b/SubServers.Creator/src/Forge/subservers.client
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/subservers.client
rename to SubServers.Creator/src/Forge/subservers.client
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/template.yml b/SubServers.Creator/src/Forge/template.yml
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Forge/template.yml
rename to SubServers.Creator/src/Forge/template.yml
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/build.sh b/SubServers.Creator/src/Spigot/build.sh
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/build.sh
rename to SubServers.Creator/src/Spigot/build.sh
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/eula.txt b/SubServers.Creator/src/Spigot/eula.txt
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/eula.txt
rename to SubServers.Creator/src/Spigot/eula.txt
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/server.properties b/SubServers.Creator/src/Spigot/server.properties
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/server.properties
rename to SubServers.Creator/src/Spigot/server.properties
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/spigot.yml b/SubServers.Creator/src/Spigot/spigot.yml
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/spigot.yml
rename to SubServers.Creator/src/Spigot/spigot.yml
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/subservers.client b/SubServers.Creator/src/Spigot/subservers.client
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/subservers.client
rename to SubServers.Creator/src/Spigot/subservers.client
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/template.yml b/SubServers.Creator/src/Spigot/template.yml
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Spigot/template.yml
rename to SubServers.Creator/src/Spigot/template.yml
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/build.sh b/SubServers.Creator/src/Sponge/build.sh
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/build.sh
rename to SubServers.Creator/src/Sponge/build.sh
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/config/sponge/global.conf b/SubServers.Creator/src/Sponge/config/sponge/global.conf
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/config/sponge/global.conf
rename to SubServers.Creator/src/Sponge/config/sponge/global.conf
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/eula.txt b/SubServers.Creator/src/Sponge/eula.txt
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/eula.txt
rename to SubServers.Creator/src/Sponge/eula.txt
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/server.properties b/SubServers.Creator/src/Sponge/server.properties
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/server.properties
rename to SubServers.Creator/src/Sponge/server.properties
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/subservers.client b/SubServers.Creator/src/Sponge/subservers.client
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/subservers.client
rename to SubServers.Creator/src/Sponge/subservers.client
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/template.yml b/SubServers.Creator/src/Sponge/template.yml
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Sponge/template.yml
rename to SubServers.Creator/src/Sponge/template.yml
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/build.sh b/SubServers.Creator/src/Vanilla/build.sh
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/build.sh
rename to SubServers.Creator/src/Vanilla/build.sh
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/eula.txt b/SubServers.Creator/src/Vanilla/eula.txt
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/eula.txt
rename to SubServers.Creator/src/Vanilla/eula.txt
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/server.properties b/SubServers.Creator/src/Vanilla/server.properties
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/server.properties
rename to SubServers.Creator/src/Vanilla/server.properties
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/template.yml b/SubServers.Creator/src/Vanilla/template.yml
similarity index 100%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/Vanilla/template.yml
rename to SubServers.Creator/src/Vanilla/template.yml
diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
index df8f4aa1..af9d603e 100644
--- a/SubServers.Host/pom.xml
+++ b/SubServers.Host/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>18w44a</version>
+            <version>18w46a</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
index 74477ad1..e6687ce2 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
@@ -33,7 +33,7 @@ import java.util.jar.Manifest;
 /**
  * SubServers.Host Main Class
  */
-@Plugin(name = "SubServers.Host", version = "2.13.2a", authors = "ME1312", description = "Host SubServers from other Machines", website = "https://github.com/ME1312/SubServers-2")
+@Plugin(name = "SubServers.Host", version = "2.13.2b", authors = "ME1312", description = "Host SubServers from other Machines", website = "https://github.com/ME1312/SubServers-2")
 public final class ExHost {
     protected NamedContainer<Long, Map<String, Map<String, String>>> lang = null;
     public HashMap<String, SubCreator.ServerTemplate> templates = new HashMap<String, SubCreator.ServerTemplate>();
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java
index 68f0b8de..220956ed 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java
@@ -335,7 +335,7 @@ public class YAMLSection {
      */
     public YAMLValue get(String handle) {
         if (Util.isNull(handle)) throw new NullPointerException();
-        return (map.get(handle) != null)?(new YAMLValue(map.get(handle), this, handle, yaml)):null;
+        return new YAMLValue(map.get(handle), this, handle, yaml);
     }
 
     /**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
index 3312502f..b1e899a7 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
@@ -44,7 +44,7 @@ public final class SubPlugin extends BungeeCord implements Listener {
     public boolean redis = false;
     public final SubAPI api = new SubAPI(this);
     public SubDataClient subdata = null;
-    public static final Version version = Version.fromString("2.13.2a");
+    public static final Version version = Version.fromString("2.13.2b");
 
     public final boolean isPatched;
     public long lastReload = -1;
diff --git a/pom.xml b/pom.xml
index 4f9d8f94..9caadb2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
     <modules>
         <module>SubServers.Client</module>
         <module>SubServers.Bungee</module>
-        <module>SubServers.Console</module>
         <module>SubServers.Host</module>
         <module>SubServers.Sync</module>
+        <module>SubServers.Console</module>
     </modules>
 </project>
\ No newline at end of file