diff --git a/.gitattributes b/.gitattributes
index f3403a755..11198e869 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,10 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
+# Normalize as LF in the repository, OS native locally
+* text
+*.java text
 
-# Denote all files that are truly binary and should not be modified.
+# Binary files that should not be modified
+*.dat binary
+*.jpg binary
 *.png binary
-*.jpg binary
\ No newline at end of file
+*.ttf binary
+*.wav binary
diff --git a/.gitignore b/.gitignore
index adc64cd7c..b74faa65e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,25 +39,28 @@ ehthumbs.db
 Icon?
 Thumbs.db
 
-# Project files #
+# Build files #
 #################
+MANIFEST.MF
+dependency-reduced-pom.xml
+
+# Project files #
+#####################
 .classpath
 .externalToolBuilders
+.idea
 .project
 .settings
-MANIFEST.MF
-
-# Netbeans files #
-##################
 build
 dist
 nbproject
+atlassian-ide-plugin.xml
 build.xml
 nb-configuration.xml
-
-# IntelliJ IDEA files #
-#######################
-.idea
 *.iml
 *.ipr
-*.iws
\ No newline at end of file
+*.iws
+
+# Misc files #
+##############
+*.bak
diff --git a/HEADER.txt b/HEADER.txt
index 48ffbd01c..bcc29efb2 100644
--- a/HEADER.txt
+++ b/HEADER.txt
@@ -1,24 +1,24 @@
 This file is part of ${name}.
 
 ${copyright} <${url}/>
-${name} is licensed under the ${license}.
+${name} is licensed under the Spout License Version 1.
 
-${name} is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+${name} is free software: you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option)
+any later version.
 
 In addition, 180 days after any changes are published, you can use the
 software, incorporating those changes, under the terms of the MIT license,
-as described in the ${license}.
+as described in the Spout License Version 1.
 
-${name} is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
+${name} is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+more details.
 
 You should have received a copy of the GNU Lesser General Public License,
-the MIT license and the ${license} along with this program.
+the MIT license and the Spout License Version 1 along with this program.
 If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
-License and see <${licenseUrl}> for the full license,
-including the MIT license.
\ No newline at end of file
+License and see <http://spout.in/licensev1> for the full license, including
+the MIT license.
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
index 5566df33e..3ef6e4389 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,24 +1,23 @@
-The dual license described in this file is called the SpoutDev License
-Version 1.
+The dual license described in this file is called the Spout License Version 1.
 
 -----------------------------------------------------------------------
 
-The software is licensed under the LGPL version 3.0.  
+The software is licensed under the GNU Lesser General Public License Version 3.
 
-In addition, the software as it existed no less than 180 days previously, 
-is licensed under the MIT license.  For clarity, files in a state that
-includes changes published less than 180 days previously, are NOT licensed 
+In addition, the software as it existed no less than 180 days previously,
+is licensed under the MIT License.  For clarity, files in a state that
+includes changes published less than 180 days previously are NOT licensed
 under the MIT license.  However, files in a state that only includes changes
-published more than 180 days previously, are licensed under the MIT license.
+published more than 180 days previously are licensed under the MIT license.
 
-The files, originating from the Glowstone and Lightstone projects, were 
-licensed by their respective authors under the MIT license.  However,
-any subsequent changes made as part of this project are licensed in 
-accordance with this license.
+The files originating from the Glowstone and Lightstone projects were
+licensed by their respective authors under the MIT License.  However, any
+subsequent changes made as part of this project are licensed in accordance
+with the dual license as described in this text.
 
-The LGPL version 3.0 license and the MIT license, including copyright 
-notice relating to the GlowStone and LightStone projects, are provided 
-below.
+The GNU Lesser General Public License Version 3 and the MIT License, including
+copyright notice relating to the Glowstone and Lightstone projects, are
+provided below.
 
 -----------------------------------------------------------------------
 
@@ -190,13 +189,13 @@ Library.
 
 -----------------------------------------------------------------------
 
-For information purposes, the license file from the Glowstone project 
-follows.  This is the license referred to as the MIT license in the 
+For information purposes, the license file from the Glowstone project
+follows.  This is the license referred to as the MIT license in the
 first paragraph.
 
 Glowstone Copyright (C) 2011 Tad Hardesty.
 Lightstone Copyright (C) 2010-2011 Graham Edgecombe.
-Spout Copyright (C) 2011 SpoutDev.
+Spout Copyright (C) 2011-2012 Spout LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -214,4 +213,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/pom.xml b/pom.xml
index 6be5703dc..b7f8b110b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 	<!-- Company information -->
 	<organization>
-		<name>VanillaDev</name>
+		<name>Spout LLC</name>
 		<url>http://www.spout.org</url>
 	</organization>
 
@@ -31,7 +31,7 @@
 	<licenses>
 		<license>
 			<name>Spout License Version 1</name>
-			<url>http://cdn.spout.org/license/spoutv1.txt</url>
+			<url>http://spout.in/licensev1</url>
 			<distribution>repo</distribution>
 			<comments>GNU Lesser General Public License Version 3, but with a provision that files are released under the MIT license 180 days after they are published.</comments>
 		</license>
@@ -76,6 +76,20 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+	<!-- Distribution management -->
+	<distributionManagement>
+		<!-- Publish releases here -->
+		<repository>
+			<id>spout-releases</id>
+			<url>http://nexus.spout.org/content/repositories/releases</url>
+		</repository>
+		<!-- Publish snapshots here -->
+		<snapshotRepository>
+			<id>spout-snapshots</id>
+			<url>http://nexus.spout.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 	<!-- Project dependencies -->
 	<dependencies>
 		<!-- Provided by third-party -->
diff --git a/src/main/java/org/spout/vanilla/VanillaListener.java b/src/main/java/org/spout/vanilla/VanillaListener.java
index 395f7bedb..739d29494 100644
--- a/src/main/java/org/spout/vanilla/VanillaListener.java
+++ b/src/main/java/org/spout/vanilla/VanillaListener.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla;
 
diff --git a/src/main/java/org/spout/vanilla/VanillaPlugin.java b/src/main/java/org/spout/vanilla/VanillaPlugin.java
index 09ec50a81..87162c312 100644
--- a/src/main/java/org/spout/vanilla/VanillaPlugin.java
+++ b/src/main/java/org/spout/vanilla/VanillaPlugin.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla;
 
@@ -140,7 +140,7 @@ public void onEnable() {
 		if(Spout.getPlatform() == Platform.CLIENT) {
 			System.out.println("Loading Skydome");
 			
-			Model m = (Model)Spout.getFilesystem().getResource("model://Spout/resources/resources/models/defaultskydome.spm");
+			Model m = (Model)Spout.getFilesystem().getResource("model://Spout/models/defaultskydome.spm");
 			System.out.println("Loaded Skydome");
 			Spout.getEngine().getWorld("world").getDataMap().put("Skydome", m);
 		}
@@ -163,8 +163,8 @@ public void onLoad() {
 		Protocol.registerProtocol(new VanillaProtocol());
 
 		VanillaMaterials.initialize();
-		MapPalette.DEFAULT = (MapPalette) Spout.getFilesystem().getResource("mappalette://Vanilla/resources/map/mapColorPalette.dat");
-		RecipeYaml.DEFAULT = (RecipeYaml) Spout.getFilesystem().getResource("recipe://Vanilla/resources/recipes.yml");
+		MapPalette.DEFAULT = (MapPalette) Spout.getFilesystem().getResource("mappalette://Vanilla/map/mapColorPalette.dat");
+		RecipeYaml.DEFAULT = (RecipeYaml) Spout.getFilesystem().getResource("recipe://Vanilla/recipes.yml");
 		VanillaRecipes.initialize();
 
 		getLogger().info("loaded");
diff --git a/src/main/java/org/spout/vanilla/chat/VanillaStyleFormatter.java b/src/main/java/org/spout/vanilla/chat/VanillaStyleFormatter.java
index 893c941fb..59764bd70 100644
--- a/src/main/java/org/spout/vanilla/chat/VanillaStyleFormatter.java
+++ b/src/main/java/org/spout/vanilla/chat/VanillaStyleFormatter.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.chat;
 
diff --git a/src/main/java/org/spout/vanilla/chat/VanillaStyleHandler.java b/src/main/java/org/spout/vanilla/chat/VanillaStyleHandler.java
index d6b816707..281012802 100644
--- a/src/main/java/org/spout/vanilla/chat/VanillaStyleHandler.java
+++ b/src/main/java/org/spout/vanilla/chat/VanillaStyleHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.chat;
 
diff --git a/src/main/java/org/spout/vanilla/command/AdministrationCommands.java b/src/main/java/org/spout/vanilla/command/AdministrationCommands.java
index 7c901926d..42f7e33f6 100644
--- a/src/main/java/org/spout/vanilla/command/AdministrationCommands.java
+++ b/src/main/java/org/spout/vanilla/command/AdministrationCommands.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.command;
 
diff --git a/src/main/java/org/spout/vanilla/command/InputCommandExecutor.java b/src/main/java/org/spout/vanilla/command/InputCommandExecutor.java
index e8cd0c9cd..18a1c379b 100644
--- a/src/main/java/org/spout/vanilla/command/InputCommandExecutor.java
+++ b/src/main/java/org/spout/vanilla/command/InputCommandExecutor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.command;
 
diff --git a/src/main/java/org/spout/vanilla/command/TestCommands.java b/src/main/java/org/spout/vanilla/command/TestCommands.java
index c86339c83..1a5a5586b 100644
--- a/src/main/java/org/spout/vanilla/command/TestCommands.java
+++ b/src/main/java/org/spout/vanilla/command/TestCommands.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.command;
 
@@ -479,27 +479,27 @@ public void spawnmob(CommandContext args, CommandSource source) throws CommandEx
 			}
 			entity.add(Human.class).setName(npcName);
 			if (Spout.getPlatform() == Platform.CLIENT) {
-				EntityPrefab humanPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/resources/entities/human/human.sep");
+				EntityPrefab humanPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/entities/human/human.sep");
 				entity = humanPrefab.createEntity(pos);
 			}
 		} else if (clazz.equals(Enderman.class)) {
 			if (Spout.getPlatform() == Platform.CLIENT) {
-				EntityPrefab endermanPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/resources/entities/enderman/enderman.sep");
+				EntityPrefab endermanPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/entities/enderman/enderman.sep");
 				entity = endermanPrefab.createEntity(pos);
 			}
 		} else if (clazz.equals(Creeper.class)) {
 			if (Spout.getPlatform() == Platform.CLIENT) {
-				EntityPrefab creeperPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/resources/entities/creeper/creeper.sep");
+				EntityPrefab creeperPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/entities/creeper/creeper.sep");
 				entity = creeperPrefab.createEntity(pos);
 			}
 		} else if (clazz.equals(Zombie.class)) {
 			if (Spout.getPlatform() == Platform.CLIENT) {
-				EntityPrefab zombiePrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/resources/entities/zombie/zombie.sep");
+				EntityPrefab zombiePrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/entities/zombie/zombie.sep");
 				entity = zombiePrefab.createEntity(pos);
 			}
 		} else if (clazz.equals(Skeleton.class)) {
 			if (Spout.getPlatform() == Platform.CLIENT) {
-				EntityPrefab skeletonPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/resources/entities/skeleton/skeleton.sep");
+				EntityPrefab skeletonPrefab = (EntityPrefab) Spout.getFilesystem().getResource("entity://Vanilla/entities/skeleton/skeleton.sep");
 				entity = skeletonPrefab.createEntity(pos);
 			}
 		}
diff --git a/src/main/java/org/spout/vanilla/component/inventory/PlayerInventory.java b/src/main/java/org/spout/vanilla/component/inventory/PlayerInventory.java
index 161c606f2..983c6affd 100644
--- a/src/main/java/org/spout/vanilla/component/inventory/PlayerInventory.java
+++ b/src/main/java/org/spout/vanilla/component/inventory/PlayerInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.inventory;
 
diff --git a/src/main/java/org/spout/vanilla/component/inventory/WindowHolder.java b/src/main/java/org/spout/vanilla/component/inventory/WindowHolder.java
index 1a6efdf7a..af8f0ae1a 100644
--- a/src/main/java/org/spout/vanilla/component/inventory/WindowHolder.java
+++ b/src/main/java/org/spout/vanilla/component/inventory/WindowHolder.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.inventory;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/Hostile.java b/src/main/java/org/spout/vanilla/component/living/Hostile.java
index 8ea4d50b6..a9c694966 100644
--- a/src/main/java/org/spout/vanilla/component/living/Hostile.java
+++ b/src/main/java/org/spout/vanilla/component/living/Hostile.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/Living.java b/src/main/java/org/spout/vanilla/component/living/Living.java
index 7ef37e89e..9d8891673 100644
--- a/src/main/java/org/spout/vanilla/component/living/Living.java
+++ b/src/main/java/org/spout/vanilla/component/living/Living.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/Neutral.java b/src/main/java/org/spout/vanilla/component/living/Neutral.java
index 6235818da..648659e93 100644
--- a/src/main/java/org/spout/vanilla/component/living/Neutral.java
+++ b/src/main/java/org/spout/vanilla/component/living/Neutral.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/Passive.java b/src/main/java/org/spout/vanilla/component/living/Passive.java
index b2424dd46..c7bcae3e4 100644
--- a/src/main/java/org/spout/vanilla/component/living/Passive.java
+++ b/src/main/java/org/spout/vanilla/component/living/Passive.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/Utility.java b/src/main/java/org/spout/vanilla/component/living/Utility.java
index 245ce7347..b61542ab2 100644
--- a/src/main/java/org/spout/vanilla/component/living/Utility.java
+++ b/src/main/java/org/spout/vanilla/component/living/Utility.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Blaze.java b/src/main/java/org/spout/vanilla/component/living/hostile/Blaze.java
index 5892262a1..9c3c21029 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Blaze.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Blaze.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/CaveSpider.java b/src/main/java/org/spout/vanilla/component/living/hostile/CaveSpider.java
index 9e0f22cff..20f2411d5 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/CaveSpider.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/CaveSpider.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Creeper.java b/src/main/java/org/spout/vanilla/component/living/hostile/Creeper.java
index 7651fd192..bbce51d2e 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Creeper.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Creeper.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/EnderDragon.java b/src/main/java/org/spout/vanilla/component/living/hostile/EnderDragon.java
index c60a8e3c7..c9b3d3651 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/EnderDragon.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/EnderDragon.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Ghast.java b/src/main/java/org/spout/vanilla/component/living/hostile/Ghast.java
index bfd2bb8ff..da6e68b6d 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Ghast.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Ghast.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Giant.java b/src/main/java/org/spout/vanilla/component/living/hostile/Giant.java
index f760c855d..21822053b 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Giant.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Giant.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/MagmaCube.java b/src/main/java/org/spout/vanilla/component/living/hostile/MagmaCube.java
index f40dc7681..1754fc076 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/MagmaCube.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/MagmaCube.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Silverfish.java b/src/main/java/org/spout/vanilla/component/living/hostile/Silverfish.java
index 77c173ed5..08edf6828 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Silverfish.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Silverfish.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Skeleton.java b/src/main/java/org/spout/vanilla/component/living/hostile/Skeleton.java
index d929080f9..1ae7c4ad5 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Skeleton.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Skeleton.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Slime.java b/src/main/java/org/spout/vanilla/component/living/hostile/Slime.java
index 64f9329a7..5bd666f04 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Slime.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Slime.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Spider.java b/src/main/java/org/spout/vanilla/component/living/hostile/Spider.java
index ee13d5382..30be80516 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Spider.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Spider.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Witch.java b/src/main/java/org/spout/vanilla/component/living/hostile/Witch.java
index bc45500d2..0419b5d3c 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Witch.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Witch.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Wither.java b/src/main/java/org/spout/vanilla/component/living/hostile/Wither.java
index 5560cd6f1..1796f0d0d 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Wither.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Wither.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/WitherSkeleton.java b/src/main/java/org/spout/vanilla/component/living/hostile/WitherSkeleton.java
index ead3d44ae..97f387b6f 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/WitherSkeleton.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/WitherSkeleton.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/hostile/Zombie.java b/src/main/java/org/spout/vanilla/component/living/hostile/Zombie.java
index 81b2575a2..20cafddf1 100644
--- a/src/main/java/org/spout/vanilla/component/living/hostile/Zombie.java
+++ b/src/main/java/org/spout/vanilla/component/living/hostile/Zombie.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.hostile;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/neutral/Bat.java b/src/main/java/org/spout/vanilla/component/living/neutral/Bat.java
index 0be608c88..2bff47d20 100644
--- a/src/main/java/org/spout/vanilla/component/living/neutral/Bat.java
+++ b/src/main/java/org/spout/vanilla/component/living/neutral/Bat.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.neutral;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/neutral/Enderman.java b/src/main/java/org/spout/vanilla/component/living/neutral/Enderman.java
index 5d7c84cf1..9a9aebfa2 100644
--- a/src/main/java/org/spout/vanilla/component/living/neutral/Enderman.java
+++ b/src/main/java/org/spout/vanilla/component/living/neutral/Enderman.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.neutral;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/neutral/Human.java b/src/main/java/org/spout/vanilla/component/living/neutral/Human.java
index bf27e0aa5..0d41e19f3 100644
--- a/src/main/java/org/spout/vanilla/component/living/neutral/Human.java
+++ b/src/main/java/org/spout/vanilla/component/living/neutral/Human.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.neutral;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/neutral/PigZombie.java b/src/main/java/org/spout/vanilla/component/living/neutral/PigZombie.java
index 93585c32c..7e738a7bf 100644
--- a/src/main/java/org/spout/vanilla/component/living/neutral/PigZombie.java
+++ b/src/main/java/org/spout/vanilla/component/living/neutral/PigZombie.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.neutral;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/neutral/Wolf.java b/src/main/java/org/spout/vanilla/component/living/neutral/Wolf.java
index 174ccf86d..7633bc44c 100644
--- a/src/main/java/org/spout/vanilla/component/living/neutral/Wolf.java
+++ b/src/main/java/org/spout/vanilla/component/living/neutral/Wolf.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.neutral;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Butcher.java b/src/main/java/org/spout/vanilla/component/living/passive/Butcher.java
index a40ad2a6b..820318359 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Butcher.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Butcher.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Chicken.java b/src/main/java/org/spout/vanilla/component/living/passive/Chicken.java
index 129508268..436189472 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Chicken.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Chicken.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Cow.java b/src/main/java/org/spout/vanilla/component/living/passive/Cow.java
index 04b8539d2..b172f896b 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Cow.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Cow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Farmer.java b/src/main/java/org/spout/vanilla/component/living/passive/Farmer.java
index be8abd9fa..b9a40a5d8 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Farmer.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Farmer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Librarian.java b/src/main/java/org/spout/vanilla/component/living/passive/Librarian.java
index a1014d3c7..b59e99cee 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Librarian.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Librarian.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/MooshroomCow.java b/src/main/java/org/spout/vanilla/component/living/passive/MooshroomCow.java
index c94f752ef..b5444c660 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/MooshroomCow.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/MooshroomCow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Ocelot.java b/src/main/java/org/spout/vanilla/component/living/passive/Ocelot.java
index a64f0b446..729358b35 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Ocelot.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Ocelot.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Pig.java b/src/main/java/org/spout/vanilla/component/living/passive/Pig.java
index 1d2296f2b..e248928c5 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Pig.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Pig.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Priest.java b/src/main/java/org/spout/vanilla/component/living/passive/Priest.java
index 4076e442d..e7fdedfe3 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Priest.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Priest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Sheep.java b/src/main/java/org/spout/vanilla/component/living/passive/Sheep.java
index 21a31466b..55781995a 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Sheep.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Sheep.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Smith.java b/src/main/java/org/spout/vanilla/component/living/passive/Smith.java
index 2fe9f4c95..f1c44bcda 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Smith.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Smith.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Squid.java b/src/main/java/org/spout/vanilla/component/living/passive/Squid.java
index 01d09181f..279678d49 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Squid.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Squid.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/passive/Villager.java b/src/main/java/org/spout/vanilla/component/living/passive/Villager.java
index 520ab5b40..522141368 100644
--- a/src/main/java/org/spout/vanilla/component/living/passive/Villager.java
+++ b/src/main/java/org/spout/vanilla/component/living/passive/Villager.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.passive;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/util/IronGolem.java b/src/main/java/org/spout/vanilla/component/living/util/IronGolem.java
index 4f58c5050..b98bd4d31 100644
--- a/src/main/java/org/spout/vanilla/component/living/util/IronGolem.java
+++ b/src/main/java/org/spout/vanilla/component/living/util/IronGolem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.util;
 
diff --git a/src/main/java/org/spout/vanilla/component/living/util/SnowGolem.java b/src/main/java/org/spout/vanilla/component/living/util/SnowGolem.java
index 053357c91..24866e99f 100644
--- a/src/main/java/org/spout/vanilla/component/living/util/SnowGolem.java
+++ b/src/main/java/org/spout/vanilla/component/living/util/SnowGolem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.living.util;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/DiggingComponent.java b/src/main/java/org/spout/vanilla/component/misc/DiggingComponent.java
index 338eb529e..6296215d0 100644
--- a/src/main/java/org/spout/vanilla/component/misc/DiggingComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/DiggingComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/DrowningComponent.java b/src/main/java/org/spout/vanilla/component/misc/DrowningComponent.java
index 59dec74fd..2596d53a3 100644
--- a/src/main/java/org/spout/vanilla/component/misc/DrowningComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/DrowningComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/HeadComponent.java b/src/main/java/org/spout/vanilla/component/misc/HeadComponent.java
index 33984414f..2dc1f8618 100644
--- a/src/main/java/org/spout/vanilla/component/misc/HeadComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/HeadComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/HealthComponent.java b/src/main/java/org/spout/vanilla/component/misc/HealthComponent.java
index 74cbbee9a..35a71e248 100644
--- a/src/main/java/org/spout/vanilla/component/misc/HealthComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/HealthComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/HungerComponent.java b/src/main/java/org/spout/vanilla/component/misc/HungerComponent.java
index 4174e33d9..e9fcdf778 100644
--- a/src/main/java/org/spout/vanilla/component/misc/HungerComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/HungerComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/InteractComponent.java b/src/main/java/org/spout/vanilla/component/misc/InteractComponent.java
index 1f2348f85..0ddb2f0e3 100644
--- a/src/main/java/org/spout/vanilla/component/misc/InteractComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/InteractComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/PickupItemComponent.java b/src/main/java/org/spout/vanilla/component/misc/PickupItemComponent.java
index 6fbb79a68..7b389d549 100644
--- a/src/main/java/org/spout/vanilla/component/misc/PickupItemComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/PickupItemComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/misc/SleepComponent.java b/src/main/java/org/spout/vanilla/component/misc/SleepComponent.java
index dd6c99183..9ca8b5a40 100644
--- a/src/main/java/org/spout/vanilla/component/misc/SleepComponent.java
+++ b/src/main/java/org/spout/vanilla/component/misc/SleepComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.misc;
 
diff --git a/src/main/java/org/spout/vanilla/component/player/HUDComponent.java b/src/main/java/org/spout/vanilla/component/player/HUDComponent.java
index 70658f7fb..d1b68291d 100644
--- a/src/main/java/org/spout/vanilla/component/player/HUDComponent.java
+++ b/src/main/java/org/spout/vanilla/component/player/HUDComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.player;
 
diff --git a/src/main/java/org/spout/vanilla/component/player/InputComponent.java b/src/main/java/org/spout/vanilla/component/player/InputComponent.java
index 757b08ea5..03724db58 100644
--- a/src/main/java/org/spout/vanilla/component/player/InputComponent.java
+++ b/src/main/java/org/spout/vanilla/component/player/InputComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.player;
 
diff --git a/src/main/java/org/spout/vanilla/component/player/PingComponent.java b/src/main/java/org/spout/vanilla/component/player/PingComponent.java
index 3175ead37..e0331a189 100644
--- a/src/main/java/org/spout/vanilla/component/player/PingComponent.java
+++ b/src/main/java/org/spout/vanilla/component/player/PingComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.player;
 
diff --git a/src/main/java/org/spout/vanilla/component/player/PlayerListComponent.java b/src/main/java/org/spout/vanilla/component/player/PlayerListComponent.java
index 150f5489e..46789cf33 100644
--- a/src/main/java/org/spout/vanilla/component/player/PlayerListComponent.java
+++ b/src/main/java/org/spout/vanilla/component/player/PlayerListComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.player;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/Item.java b/src/main/java/org/spout/vanilla/component/substance/Item.java
index 64eb435a2..5f35d8e08 100644
--- a/src/main/java/org/spout/vanilla/component/substance/Item.java
+++ b/src/main/java/org/spout/vanilla/component/substance/Item.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/Lightning.java b/src/main/java/org/spout/vanilla/component/substance/Lightning.java
index 127d6b523..db74704d6 100644
--- a/src/main/java/org/spout/vanilla/component/substance/Lightning.java
+++ b/src/main/java/org/spout/vanilla/component/substance/Lightning.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/Painting.java b/src/main/java/org/spout/vanilla/component/substance/Painting.java
index b8db7ce8e..7ebdfc8ed 100644
--- a/src/main/java/org/spout/vanilla/component/substance/Painting.java
+++ b/src/main/java/org/spout/vanilla/component/substance/Painting.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/Potion.java b/src/main/java/org/spout/vanilla/component/substance/Potion.java
index 98f190b13..dfe7ae18d 100644
--- a/src/main/java/org/spout/vanilla/component/substance/Potion.java
+++ b/src/main/java/org/spout/vanilla/component/substance/Potion.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/XPOrb.java b/src/main/java/org/spout/vanilla/component/substance/XPOrb.java
index f1efe80fd..734c77d62 100644
--- a/src/main/java/org/spout/vanilla/component/substance/XPOrb.java
+++ b/src/main/java/org/spout/vanilla/component/substance/XPOrb.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Anvil.java b/src/main/java/org/spout/vanilla/component/substance/material/Anvil.java
index 0f23907f3..3e81e3b24 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Anvil.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Anvil.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Beacon.java b/src/main/java/org/spout/vanilla/component/substance/material/Beacon.java
index dc949d54e..3e438c65a 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Beacon.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Beacon.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/BrewingStand.java b/src/main/java/org/spout/vanilla/component/substance/material/BrewingStand.java
index d47e5bf2d..97d0f170c 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/BrewingStand.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/BrewingStand.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Dispenser.java b/src/main/java/org/spout/vanilla/component/substance/material/Dispenser.java
index 67ce0cf97..4fee608d6 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Dispenser.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Dispenser.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/EnchantmentTable.java b/src/main/java/org/spout/vanilla/component/substance/material/EnchantmentTable.java
index c4e5d8307..7e5a54083 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/EnchantmentTable.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/EnchantmentTable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Furnace.java b/src/main/java/org/spout/vanilla/component/substance/material/Furnace.java
index 15a701636..1cc5f5ed2 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Furnace.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Furnace.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Jukebox.java b/src/main/java/org/spout/vanilla/component/substance/material/Jukebox.java
index 4174238d1..c1c3ff3ed 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Jukebox.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Jukebox.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/MonsterSpawner.java b/src/main/java/org/spout/vanilla/component/substance/material/MonsterSpawner.java
index feb8a79a6..ade31599f 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/MonsterSpawner.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/MonsterSpawner.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/NoteBlock.java b/src/main/java/org/spout/vanilla/component/substance/material/NoteBlock.java
index 231121303..60bab209e 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/NoteBlock.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/NoteBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Piston.java b/src/main/java/org/spout/vanilla/component/substance/material/Piston.java
index a710850a2..4dfb5b86c 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Piston.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Piston.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/Sign.java b/src/main/java/org/spout/vanilla/component/substance/material/Sign.java
index 4767d38c3..2a6ca2a58 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/Sign.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/Sign.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/VanillaBlockComponent.java b/src/main/java/org/spout/vanilla/component/substance/material/VanillaBlockComponent.java
index 46e426cca..819951d07 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/VanillaBlockComponent.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/VanillaBlockComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/ViewedBlockComponent.java b/src/main/java/org/spout/vanilla/component/substance/material/ViewedBlockComponent.java
index 103052b04..41fe587cf 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/ViewedBlockComponent.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/ViewedBlockComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/chest/AbstractChest.java b/src/main/java/org/spout/vanilla/component/substance/material/chest/AbstractChest.java
index 490a9ebcf..a6563bf04 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/chest/AbstractChest.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/chest/AbstractChest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material.chest;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/chest/Chest.java b/src/main/java/org/spout/vanilla/component/substance/material/chest/Chest.java
index d3a98f5b3..30eadf022 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/chest/Chest.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/chest/Chest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material.chest;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/material/chest/EnderChest.java b/src/main/java/org/spout/vanilla/component/substance/material/chest/EnderChest.java
index 2ada03169..18ad48fec 100644
--- a/src/main/java/org/spout/vanilla/component/substance/material/chest/EnderChest.java
+++ b/src/main/java/org/spout/vanilla/component/substance/material/chest/EnderChest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.material.chest;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/EnderCrystal.java b/src/main/java/org/spout/vanilla/component/substance/object/EnderCrystal.java
index 616c54669..6a5acb370 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/EnderCrystal.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/EnderCrystal.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/EyeOfEnder.java b/src/main/java/org/spout/vanilla/component/substance/object/EyeOfEnder.java
index 2bc84994d..5f378b4e1 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/EyeOfEnder.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/EyeOfEnder.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/FallingBlock.java b/src/main/java/org/spout/vanilla/component/substance/object/FallingBlock.java
index 76d191fec..cc05946b2 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/FallingBlock.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/FallingBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/FallingDragonEgg.java b/src/main/java/org/spout/vanilla/component/substance/object/FallingDragonEgg.java
index 67cbf6112..0a2c55333 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/FallingDragonEgg.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/FallingDragonEgg.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/FireworksRocket.java b/src/main/java/org/spout/vanilla/component/substance/object/FireworksRocket.java
index 364b8c9c2..223b36acb 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/FireworksRocket.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/FireworksRocket.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/ObjectEntity.java b/src/main/java/org/spout/vanilla/component/substance/object/ObjectEntity.java
index 2aa6d32e6..f49ada07e 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/ObjectEntity.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/ObjectEntity.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/Tnt.java b/src/main/java/org/spout/vanilla/component/substance/object/Tnt.java
index 975c4f26a..bd6d1bbc9 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/Tnt.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/Tnt.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Arrow.java b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Arrow.java
index 7281d495c..169fd6f08 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Arrow.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Arrow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.projectile;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Egg.java b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Egg.java
index 06d9fbc68..f61bdfaf9 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Egg.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Egg.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.projectile;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/projectile/FishingBob.java b/src/main/java/org/spout/vanilla/component/substance/object/projectile/FishingBob.java
index 81a73b211..34de9154d 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/projectile/FishingBob.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/projectile/FishingBob.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.projectile;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Projectile.java b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Projectile.java
index 308cf8d75..189efb763 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Projectile.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Projectile.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.projectile;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Snowball.java b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Snowball.java
index a46d2389a..8c0eb33f9 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/projectile/Snowball.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/projectile/Snowball.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.projectile;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Boat.java b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Boat.java
index f85eae384..4285f775a 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Boat.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Boat.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.vehicle;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Minecart.java b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Minecart.java
index b311aeb53..e2a676ccb 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Minecart.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/Minecart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.vehicle;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/PoweredMinecart.java b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/PoweredMinecart.java
index 3606c2ca5..9c15f6fe3 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/PoweredMinecart.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/PoweredMinecart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.vehicle;
 
diff --git a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/StorageMinecart.java b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/StorageMinecart.java
index 48e11b9b4..57195f0f0 100644
--- a/src/main/java/org/spout/vanilla/component/substance/object/vehicle/StorageMinecart.java
+++ b/src/main/java/org/spout/vanilla/component/substance/object/vehicle/StorageMinecart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.substance.object.vehicle;
 
diff --git a/src/main/java/org/spout/vanilla/component/test/TransformDebugComponent.java b/src/main/java/org/spout/vanilla/component/test/TransformDebugComponent.java
index e00eb1912..2e81efe02 100644
--- a/src/main/java/org/spout/vanilla/component/test/TransformDebugComponent.java
+++ b/src/main/java/org/spout/vanilla/component/test/TransformDebugComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.test;
 
diff --git a/src/main/java/org/spout/vanilla/component/world/VanillaSky.java b/src/main/java/org/spout/vanilla/component/world/VanillaSky.java
index 876083238..57ee893a5 100644
--- a/src/main/java/org/spout/vanilla/component/world/VanillaSky.java
+++ b/src/main/java/org/spout/vanilla/component/world/VanillaSky.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.world;
 
diff --git a/src/main/java/org/spout/vanilla/component/world/sky/NetherSky.java b/src/main/java/org/spout/vanilla/component/world/sky/NetherSky.java
index f5e21c42a..6b6c80126 100644
--- a/src/main/java/org/spout/vanilla/component/world/sky/NetherSky.java
+++ b/src/main/java/org/spout/vanilla/component/world/sky/NetherSky.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.world.sky;
 
diff --git a/src/main/java/org/spout/vanilla/component/world/sky/NormalSky.java b/src/main/java/org/spout/vanilla/component/world/sky/NormalSky.java
index f9af17fce..12c811c75 100644
--- a/src/main/java/org/spout/vanilla/component/world/sky/NormalSky.java
+++ b/src/main/java/org/spout/vanilla/component/world/sky/NormalSky.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.world.sky;
 
diff --git a/src/main/java/org/spout/vanilla/component/world/sky/TheEndSky.java b/src/main/java/org/spout/vanilla/component/world/sky/TheEndSky.java
index ee5abbb07..9973d98ad 100644
--- a/src/main/java/org/spout/vanilla/component/world/sky/TheEndSky.java
+++ b/src/main/java/org/spout/vanilla/component/world/sky/TheEndSky.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.component.world.sky;
 
diff --git a/src/main/java/org/spout/vanilla/configuration/InputConfiguration.java b/src/main/java/org/spout/vanilla/configuration/InputConfiguration.java
index dd0ff5091..bbe5fc3c4 100644
--- a/src/main/java/org/spout/vanilla/configuration/InputConfiguration.java
+++ b/src/main/java/org/spout/vanilla/configuration/InputConfiguration.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.configuration;
 
diff --git a/src/main/java/org/spout/vanilla/configuration/OpConfiguration.java b/src/main/java/org/spout/vanilla/configuration/OpConfiguration.java
index 84baf8a4d..e1a1cfb12 100644
--- a/src/main/java/org/spout/vanilla/configuration/OpConfiguration.java
+++ b/src/main/java/org/spout/vanilla/configuration/OpConfiguration.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.configuration;
 
diff --git a/src/main/java/org/spout/vanilla/configuration/VanillaConfiguration.java b/src/main/java/org/spout/vanilla/configuration/VanillaConfiguration.java
index e1522349b..7cf5a4e90 100644
--- a/src/main/java/org/spout/vanilla/configuration/VanillaConfiguration.java
+++ b/src/main/java/org/spout/vanilla/configuration/VanillaConfiguration.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.configuration;
 
diff --git a/src/main/java/org/spout/vanilla/configuration/WorldConfiguration.java b/src/main/java/org/spout/vanilla/configuration/WorldConfiguration.java
index 064d2c54d..671513782 100644
--- a/src/main/java/org/spout/vanilla/configuration/WorldConfiguration.java
+++ b/src/main/java/org/spout/vanilla/configuration/WorldConfiguration.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.configuration;
 
diff --git a/src/main/java/org/spout/vanilla/configuration/WorldConfigurationNode.java b/src/main/java/org/spout/vanilla/configuration/WorldConfigurationNode.java
index 37e796f65..f9086dbdc 100644
--- a/src/main/java/org/spout/vanilla/configuration/WorldConfigurationNode.java
+++ b/src/main/java/org/spout/vanilla/configuration/WorldConfigurationNode.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.configuration;
 
diff --git a/src/main/java/org/spout/vanilla/data/Animation.java b/src/main/java/org/spout/vanilla/data/Animation.java
index b4e9c964b..3409d6b55 100644
--- a/src/main/java/org/spout/vanilla/data/Animation.java
+++ b/src/main/java/org/spout/vanilla/data/Animation.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/Climate.java b/src/main/java/org/spout/vanilla/data/Climate.java
index 5c13cd261..34d958baf 100644
--- a/src/main/java/org/spout/vanilla/data/Climate.java
+++ b/src/main/java/org/spout/vanilla/data/Climate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/Difficulty.java b/src/main/java/org/spout/vanilla/data/Difficulty.java
index c921e9f5b..73b992d7f 100644
--- a/src/main/java/org/spout/vanilla/data/Difficulty.java
+++ b/src/main/java/org/spout/vanilla/data/Difficulty.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/Dimension.java b/src/main/java/org/spout/vanilla/data/Dimension.java
index d4fc5bab9..d2d8c2964 100644
--- a/src/main/java/org/spout/vanilla/data/Dimension.java
+++ b/src/main/java/org/spout/vanilla/data/Dimension.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/ExhaustionLevel.java b/src/main/java/org/spout/vanilla/data/ExhaustionLevel.java
index 7960c963d..1de0b026b 100644
--- a/src/main/java/org/spout/vanilla/data/ExhaustionLevel.java
+++ b/src/main/java/org/spout/vanilla/data/ExhaustionLevel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/GameMode.java b/src/main/java/org/spout/vanilla/data/GameMode.java
index b20367def..12ed20299 100644
--- a/src/main/java/org/spout/vanilla/data/GameMode.java
+++ b/src/main/java/org/spout/vanilla/data/GameMode.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/Instrument.java b/src/main/java/org/spout/vanilla/data/Instrument.java
index 64a12f7e5..55319d683 100644
--- a/src/main/java/org/spout/vanilla/data/Instrument.java
+++ b/src/main/java/org/spout/vanilla/data/Instrument.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/MoveReaction.java b/src/main/java/org/spout/vanilla/data/MoveReaction.java
index 23b4afb7e..30d0fb0f6 100644
--- a/src/main/java/org/spout/vanilla/data/MoveReaction.java
+++ b/src/main/java/org/spout/vanilla/data/MoveReaction.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/Music.java b/src/main/java/org/spout/vanilla/data/Music.java
index c73c1f7da..f86b870e1 100644
--- a/src/main/java/org/spout/vanilla/data/Music.java
+++ b/src/main/java/org/spout/vanilla/data/Music.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/PaintingType.java b/src/main/java/org/spout/vanilla/data/PaintingType.java
index 2f54633bb..e2fb78382 100644
--- a/src/main/java/org/spout/vanilla/data/PaintingType.java
+++ b/src/main/java/org/spout/vanilla/data/PaintingType.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/RailsState.java b/src/main/java/org/spout/vanilla/data/RailsState.java
index 74f3af042..e9316c7f5 100644
--- a/src/main/java/org/spout/vanilla/data/RailsState.java
+++ b/src/main/java/org/spout/vanilla/data/RailsState.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/RedstonePowerMode.java b/src/main/java/org/spout/vanilla/data/RedstonePowerMode.java
index 756584d67..39f009ef9 100644
--- a/src/main/java/org/spout/vanilla/data/RedstonePowerMode.java
+++ b/src/main/java/org/spout/vanilla/data/RedstonePowerMode.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/SlimeSize.java b/src/main/java/org/spout/vanilla/data/SlimeSize.java
index d8fbcc2d1..0beffb5eb 100644
--- a/src/main/java/org/spout/vanilla/data/SlimeSize.java
+++ b/src/main/java/org/spout/vanilla/data/SlimeSize.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/Time.java b/src/main/java/org/spout/vanilla/data/Time.java
index 81fa93822..23164a4a7 100644
--- a/src/main/java/org/spout/vanilla/data/Time.java
+++ b/src/main/java/org/spout/vanilla/data/Time.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/VanillaData.java b/src/main/java/org/spout/vanilla/data/VanillaData.java
index fc75bfef4..6e2b78052 100644
--- a/src/main/java/org/spout/vanilla/data/VanillaData.java
+++ b/src/main/java/org/spout/vanilla/data/VanillaData.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/VanillaRenderMaterials.java b/src/main/java/org/spout/vanilla/data/VanillaRenderMaterials.java
index 5d718205b..0fe965d03 100644
--- a/src/main/java/org/spout/vanilla/data/VanillaRenderMaterials.java
+++ b/src/main/java/org/spout/vanilla/data/VanillaRenderMaterials.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
@@ -53,18 +53,18 @@ public final class VanillaRenderMaterials {
 
 	static {
 		if (Spout.getPlatform() == Platform.CLIENT) {
-			FONT = (Font) fileSystem.getResource("font://Spout/resources/resources/fonts/ubuntu/Ubuntu-M.ttf");
-			HOTBAR_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/HotbarGUIMaterial.smt");
-			ICONS_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/IconsGUIMaterial.smt");
-			INVENTORY_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/InventoryGUIMaterial.smt");
-			CONTAINER_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/ContainerGUIMaterial.smt");
-			CRAFTING_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/CraftingGUIMaterial.smt");
-			FURNACE_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/FurnaceGUIMaterial.smt");
-			TRAP_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/TrapGUIMaterial.smt");
-			ENCHANT_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/InventoryGUIMaterial.smt");
-			ALCHEMY_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/InventoryGUIMaterial.smt");
-			ITEMS_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/gui/smt/ItemsGUIMaterial.smt");
-			BLOCKS_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/resources/materials/terrain.smt");
+			FONT = (Font) fileSystem.getResource("font://Spout/fonts/ubuntu/Ubuntu-M.ttf");
+			HOTBAR_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/HotbarGUIMaterial.smt");
+			ICONS_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/IconsGUIMaterial.smt");
+			INVENTORY_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/InventoryGUIMaterial.smt");
+			CONTAINER_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/ContainerGUIMaterial.smt");
+			CRAFTING_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/CraftingGUIMaterial.smt");
+			FURNACE_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/FurnaceGUIMaterial.smt");
+			TRAP_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/TrapGUIMaterial.smt");
+			ENCHANT_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/InventoryGUIMaterial.smt");
+			ALCHEMY_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/InventoryGUIMaterial.smt");
+			ITEMS_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/gui/smt/ItemsGUIMaterial.smt");
+			BLOCKS_MATERIAL = (RenderMaterial) fileSystem.getResource("material://Vanilla/materials/terrain.smt");
 		} else {
 			FONT = null;
 			HOTBAR_MATERIAL = null;
diff --git a/src/main/java/org/spout/vanilla/data/Weather.java b/src/main/java/org/spout/vanilla/data/Weather.java
index 164014d81..598f1ed4f 100644
--- a/src/main/java/org/spout/vanilla/data/Weather.java
+++ b/src/main/java/org/spout/vanilla/data/Weather.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/WorldType.java b/src/main/java/org/spout/vanilla/data/WorldType.java
index 7c14eca84..d5df9d9a6 100644
--- a/src/main/java/org/spout/vanilla/data/WorldType.java
+++ b/src/main/java/org/spout/vanilla/data/WorldType.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/Drop.java b/src/main/java/org/spout/vanilla/data/drops/Drop.java
index 5bf058d71..69e021d88 100644
--- a/src/main/java/org/spout/vanilla/data/drops/Drop.java
+++ b/src/main/java/org/spout/vanilla/data/drops/Drop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/Drops.java b/src/main/java/org/spout/vanilla/data/drops/Drops.java
index f0b31c973..45069bae9 100644
--- a/src/main/java/org/spout/vanilla/data/drops/Drops.java
+++ b/src/main/java/org/spout/vanilla/data/drops/Drops.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/SelectedDrops.java b/src/main/java/org/spout/vanilla/data/drops/SelectedDrops.java
index 374e37be8..564cba4fb 100644
--- a/src/main/java/org/spout/vanilla/data/drops/SelectedDrops.java
+++ b/src/main/java/org/spout/vanilla/data/drops/SelectedDrops.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/SwitchDrops.java b/src/main/java/org/spout/vanilla/data/drops/SwitchDrops.java
index 2a8ce34d3..d79e1cc6f 100644
--- a/src/main/java/org/spout/vanilla/data/drops/SwitchDrops.java
+++ b/src/main/java/org/spout/vanilla/data/drops/SwitchDrops.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/BlockFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/BlockFlags.java
index 456a8c7fe..05a6ede4b 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/BlockFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/BlockFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/DropFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/DropFlags.java
index 38e5c4e9e..9fb1bc080 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/DropFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/DropFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/HeldItemFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/HeldItemFlags.java
index 7fb927a19..f4a2e0e86 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/HeldItemFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/HeldItemFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/PlayerFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/PlayerFlags.java
index 3c5b4f7ae..ecd2a9f40 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/PlayerFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/PlayerFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/ToolEnchantFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/ToolEnchantFlags.java
index 6e48efc28..33280f7e2 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/ToolEnchantFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/ToolEnchantFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/ToolLevelFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/ToolLevelFlags.java
index 18bf6858d..ce855f64e 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/ToolLevelFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/ToolLevelFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/flag/ToolTypeFlags.java b/src/main/java/org/spout/vanilla/data/drops/flag/ToolTypeFlags.java
index 0dd25f840..c656a02a9 100644
--- a/src/main/java/org/spout/vanilla/data/drops/flag/ToolTypeFlags.java
+++ b/src/main/java/org/spout/vanilla/data/drops/flag/ToolTypeFlags.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.flag;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/type/ContentsDrop.java b/src/main/java/org/spout/vanilla/data/drops/type/ContentsDrop.java
index c982c6f43..92f0f77f0 100644
--- a/src/main/java/org/spout/vanilla/data/drops/type/ContentsDrop.java
+++ b/src/main/java/org/spout/vanilla/data/drops/type/ContentsDrop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/type/FixedDrop.java b/src/main/java/org/spout/vanilla/data/drops/type/FixedDrop.java
index 8fb489bef..1a6b6f6a0 100644
--- a/src/main/java/org/spout/vanilla/data/drops/type/FixedDrop.java
+++ b/src/main/java/org/spout/vanilla/data/drops/type/FixedDrop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/type/RandomDrop.java b/src/main/java/org/spout/vanilla/data/drops/type/RandomDrop.java
index 4234e21aa..00c0ee002 100644
--- a/src/main/java/org/spout/vanilla/data/drops/type/RandomDrop.java
+++ b/src/main/java/org/spout/vanilla/data/drops/type/RandomDrop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/type/RandomRangeDrop.java b/src/main/java/org/spout/vanilla/data/drops/type/RandomRangeDrop.java
index 2e114bf9e..0fe8810fa 100644
--- a/src/main/java/org/spout/vanilla/data/drops/type/RandomRangeDrop.java
+++ b/src/main/java/org/spout/vanilla/data/drops/type/RandomRangeDrop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/drops/type/block/BlockDrops.java b/src/main/java/org/spout/vanilla/data/drops/type/block/BlockDrops.java
index 223d7f069..334aef95a 100644
--- a/src/main/java/org/spout/vanilla/data/drops/type/block/BlockDrops.java
+++ b/src/main/java/org/spout/vanilla/data/drops/type/block/BlockDrops.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.drops.type.block;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/BatchEffect.java b/src/main/java/org/spout/vanilla/data/effect/BatchEffect.java
index aca5f57b7..44b933bd6 100644
--- a/src/main/java/org/spout/vanilla/data/effect/BatchEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/BatchEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/Effect.java b/src/main/java/org/spout/vanilla/data/effect/Effect.java
index 1e60add14..05ef586ae 100644
--- a/src/main/java/org/spout/vanilla/data/effect/Effect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/Effect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/GeneralEffect.java b/src/main/java/org/spout/vanilla/data/effect/GeneralEffect.java
index 1eb869d3a..12eb9eafd 100644
--- a/src/main/java/org/spout/vanilla/data/effect/GeneralEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/GeneralEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/RandomEffect.java b/src/main/java/org/spout/vanilla/data/effect/RandomEffect.java
index d4639c801..6db434a98 100644
--- a/src/main/java/org/spout/vanilla/data/effect/RandomEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/RandomEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/RandomPitchSoundEffect.java b/src/main/java/org/spout/vanilla/data/effect/RandomPitchSoundEffect.java
index 8e6fb2ccc..925d08ab4 100644
--- a/src/main/java/org/spout/vanilla/data/effect/RandomPitchSoundEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/RandomPitchSoundEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/SoundEffect.java b/src/main/java/org/spout/vanilla/data/effect/SoundEffect.java
index cd84699a2..b401027cc 100644
--- a/src/main/java/org/spout/vanilla/data/effect/SoundEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/SoundEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/store/GeneralEffects.java b/src/main/java/org/spout/vanilla/data/effect/store/GeneralEffects.java
index ed5cc419f..79eac3ada 100644
--- a/src/main/java/org/spout/vanilla/data/effect/store/GeneralEffects.java
+++ b/src/main/java/org/spout/vanilla/data/effect/store/GeneralEffects.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.store;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/store/SoundEffects.java b/src/main/java/org/spout/vanilla/data/effect/store/SoundEffects.java
index cf718cedb..3dd48f64d 100644
--- a/src/main/java/org/spout/vanilla/data/effect/store/SoundEffects.java
+++ b/src/main/java/org/spout/vanilla/data/effect/store/SoundEffects.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.store;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/BatchExplosionEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/BatchExplosionEffect.java
index 0009a8564..5760c30e8 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/BatchExplosionEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/BatchExplosionEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/BreakBlockEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/BreakBlockEffect.java
index 13a2b22e0..70f2bb231 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/BreakBlockEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/BreakBlockEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/ExplosionEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/ExplosionEffect.java
index 402023eec..081fc929c 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/ExplosionEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/ExplosionEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/LavaFizzEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/LavaFizzEffect.java
index f5cd1eb5f..3594e585c 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/LavaFizzEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/LavaFizzEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/MusicDiscEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/MusicDiscEffect.java
index 50eb0fe06..3c0e71c66 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/MusicDiscEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/MusicDiscEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/NoSoundEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/NoSoundEffect.java
index 758bd0107..86dae4d8f 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/NoSoundEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/NoSoundEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/NoteParticleEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/NoteParticleEffect.java
index d7419dd39..8eda5539d 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/NoteParticleEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/NoteParticleEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/NoteSoundEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/NoteSoundEffect.java
index fc76eac80..c23b6d77c 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/NoteSoundEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/NoteSoundEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/PressBlockEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/PressBlockEffect.java
index ab6c850e4..741a0117a 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/PressBlockEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/PressBlockEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/SmokeEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/SmokeEffect.java
index 8bc9af30a..129439d90 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/SmokeEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/SmokeEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/effect/type/ToggleSoundEffect.java b/src/main/java/org/spout/vanilla/data/effect/type/ToggleSoundEffect.java
index 63b00f4dd..b9bd169d6 100644
--- a/src/main/java/org/spout/vanilla/data/effect/type/ToggleSoundEffect.java
+++ b/src/main/java/org/spout/vanilla/data/effect/type/ToggleSoundEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.effect.type;
 
diff --git a/src/main/java/org/spout/vanilla/data/tool/ToolLevel.java b/src/main/java/org/spout/vanilla/data/tool/ToolLevel.java
index f132b22bf..7d0a602e9 100644
--- a/src/main/java/org/spout/vanilla/data/tool/ToolLevel.java
+++ b/src/main/java/org/spout/vanilla/data/tool/ToolLevel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.tool;
 
diff --git a/src/main/java/org/spout/vanilla/data/tool/ToolType.java b/src/main/java/org/spout/vanilla/data/tool/ToolType.java
index 62938f2fa..cd28e0906 100644
--- a/src/main/java/org/spout/vanilla/data/tool/ToolType.java
+++ b/src/main/java/org/spout/vanilla/data/tool/ToolType.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.data.tool;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/BlockActionEvent.java b/src/main/java/org/spout/vanilla/event/block/BlockActionEvent.java
index eb6239bcb..94c657d3b 100644
--- a/src/main/java/org/spout/vanilla/event/block/BlockActionEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/BlockActionEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/BlockControllerDataEvent.java b/src/main/java/org/spout/vanilla/event/block/BlockControllerDataEvent.java
index cbf63a58c..09b322cdc 100644
--- a/src/main/java/org/spout/vanilla/event/block/BlockControllerDataEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/BlockControllerDataEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/BlockDisappearEvent.java b/src/main/java/org/spout/vanilla/event/block/BlockDisappearEvent.java
index f6999d031..5ff7afe42 100644
--- a/src/main/java/org/spout/vanilla/event/block/BlockDisappearEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/BlockDisappearEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/BlockFormEvent.java b/src/main/java/org/spout/vanilla/event/block/BlockFormEvent.java
index fcb7dbfe3..baeb59f50 100644
--- a/src/main/java/org/spout/vanilla/event/block/BlockFormEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/BlockFormEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/BlockGrowEvent.java b/src/main/java/org/spout/vanilla/event/block/BlockGrowEvent.java
index 5313532f7..10d931de5 100644
--- a/src/main/java/org/spout/vanilla/event/block/BlockGrowEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/BlockGrowEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/BlockIgniteEvent.java b/src/main/java/org/spout/vanilla/event/block/BlockIgniteEvent.java
index 8db923765..a02e0c606 100644
--- a/src/main/java/org/spout/vanilla/event/block/BlockIgniteEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/BlockIgniteEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/FurnaceActionEvent.java b/src/main/java/org/spout/vanilla/event/block/FurnaceActionEvent.java
index a55f09c46..f4dd9bea3 100644
--- a/src/main/java/org/spout/vanilla/event/block/FurnaceActionEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/FurnaceActionEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/FurnaceBurnEvent.java b/src/main/java/org/spout/vanilla/event/block/FurnaceBurnEvent.java
index da9c84477..bf788d757 100644
--- a/src/main/java/org/spout/vanilla/event/block/FurnaceBurnEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/FurnaceBurnEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/FurnaceSmeltEvent.java b/src/main/java/org/spout/vanilla/event/block/FurnaceSmeltEvent.java
index 096c29113..029d1e944 100644
--- a/src/main/java/org/spout/vanilla/event/block/FurnaceSmeltEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/FurnaceSmeltEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/RedstoneChangeEvent.java b/src/main/java/org/spout/vanilla/event/block/RedstoneChangeEvent.java
index 135328c92..686fb1328 100644
--- a/src/main/java/org/spout/vanilla/event/block/RedstoneChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/RedstoneChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/block/SignUpdateEvent.java b/src/main/java/org/spout/vanilla/event/block/SignUpdateEvent.java
index 6909cac69..f9316370a 100644
--- a/src/main/java/org/spout/vanilla/event/block/SignUpdateEvent.java
+++ b/src/main/java/org/spout/vanilla/event/block/SignUpdateEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.block;
 
diff --git a/src/main/java/org/spout/vanilla/event/cause/PlayerBreakCause.java b/src/main/java/org/spout/vanilla/event/cause/PlayerBreakCause.java
index b38106026..db7822572 100644
--- a/src/main/java/org/spout/vanilla/event/cause/PlayerBreakCause.java
+++ b/src/main/java/org/spout/vanilla/event/cause/PlayerBreakCause.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.cause;
 
diff --git a/src/main/java/org/spout/vanilla/event/cause/PlayerPlacementCause.java b/src/main/java/org/spout/vanilla/event/cause/PlayerPlacementCause.java
index 3ea8d250e..d0b04cb44 100644
--- a/src/main/java/org/spout/vanilla/event/cause/PlayerPlacementCause.java
+++ b/src/main/java/org/spout/vanilla/event/cause/PlayerPlacementCause.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.cause;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/CraftingResultEvent.java b/src/main/java/org/spout/vanilla/event/entity/CraftingResultEvent.java
index 8b7f39579..930cd5e73 100644
--- a/src/main/java/org/spout/vanilla/event/entity/CraftingResultEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/CraftingResultEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityAnimationEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityAnimationEvent.java
index 306fa81b9..c49f693cc 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityAnimationEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityAnimationEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityCollectItemEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityCollectItemEvent.java
index e8285fb9e..b0e7a2aa0 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityCollectItemEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityCollectItemEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityCombustEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityCombustEvent.java
index 96d236632..70bf03d7e 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityCombustEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityCombustEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityDamageEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityDamageEvent.java
index 7b462f2b7..57e2b68db 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityDamageEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityEquipmentEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityEquipmentEvent.java
index 4549f70bd..cdf713291 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityEquipmentEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityEquipmentEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityExplodeEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityExplodeEvent.java
index 38529b37e..2f34279ac 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityExplodeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityExplodeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityMetaChangeEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityMetaChangeEvent.java
index 4761ffa77..a2ccb0359 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityMetaChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityMetaChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityStatusEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityStatusEvent.java
index d20c25cab..974200aa0 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityStatusEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityStatusEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityTameEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityTameEvent.java
index 1b275ffb6..063f63403 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityTameEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityTameEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/EntityTargetEvent.java b/src/main/java/org/spout/vanilla/event/entity/EntityTargetEvent.java
index c2c319bc2..da7c1182f 100644
--- a/src/main/java/org/spout/vanilla/event/entity/EntityTargetEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/EntityTargetEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/PotionSplashEvent.java b/src/main/java/org/spout/vanilla/event/entity/PotionSplashEvent.java
index 78cf8d77b..16ebd69f5 100644
--- a/src/main/java/org/spout/vanilla/event/entity/PotionSplashEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/PotionSplashEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/ProjectileHitEvent.java b/src/main/java/org/spout/vanilla/event/entity/ProjectileHitEvent.java
index 3ca51c1cf..b87919ee9 100644
--- a/src/main/java/org/spout/vanilla/event/entity/ProjectileHitEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/ProjectileHitEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/SlimeSplitEvent.java b/src/main/java/org/spout/vanilla/event/entity/SlimeSplitEvent.java
index a063c2d87..5472944a0 100644
--- a/src/main/java/org/spout/vanilla/event/entity/SlimeSplitEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/SlimeSplitEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/VanillaEntityDeathEvent.java b/src/main/java/org/spout/vanilla/event/entity/VanillaEntityDeathEvent.java
index c7e36038e..1a97b1146 100644
--- a/src/main/java/org/spout/vanilla/event/entity/VanillaEntityDeathEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/VanillaEntityDeathEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/entity/VanillaEntityTeleportEvent.java b/src/main/java/org/spout/vanilla/event/entity/VanillaEntityTeleportEvent.java
index de2caf680..a2aa1e866 100644
--- a/src/main/java/org/spout/vanilla/event/entity/VanillaEntityTeleportEvent.java
+++ b/src/main/java/org/spout/vanilla/event/entity/VanillaEntityTeleportEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.entity;
 
diff --git a/src/main/java/org/spout/vanilla/event/game/ServerListPingEvent.java b/src/main/java/org/spout/vanilla/event/game/ServerListPingEvent.java
index 3d6630b4e..2979a6937 100644
--- a/src/main/java/org/spout/vanilla/event/game/ServerListPingEvent.java
+++ b/src/main/java/org/spout/vanilla/event/game/ServerListPingEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.game;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerBucketEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerBucketEvent.java
index 57b0fc9c8..37992078c 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerBucketEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerBucketEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerDeathEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerDeathEvent.java
index 98c381ccd..33caaf78d 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerDeathEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerDeathEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerFishEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerFishEvent.java
index c504abe5a..e437603a1 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerFishEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerFishEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerFoodSaturationChangeEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerFoodSaturationChangeEvent.java
index 44a7aa3db..b3008a8cd 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerFoodSaturationChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerFoodSaturationChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerGameModeChangedEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerGameModeChangedEvent.java
index 2f7ce961c..aec599c07 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerGameModeChangedEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerGameModeChangedEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerHeldItemChangeEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerHeldItemChangeEvent.java
index 692da3bc9..ac1914989 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerHeldItemChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerHeldItemChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 /*
  * This file is part of SpoutAPI.
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerHungerChangeEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerHungerChangeEvent.java
index 3a7ca1fb1..610f02639 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerHungerChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerHungerChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerLevelChangeEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerLevelChangeEvent.java
index d2f87b08e..b08e11b06 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerLevelChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerLevelChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerRespawnEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerRespawnEvent.java
index 04fd9a878..ec1dab453 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerRespawnEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerRespawnEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/PlayerSlotChangeEvent.java b/src/main/java/org/spout/vanilla/event/player/PlayerSlotChangeEvent.java
index 205da2bc1..91d98feb8 100644
--- a/src/main/java/org/spout/vanilla/event/player/PlayerSlotChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/PlayerSlotChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/network/PlayerBedEvent.java b/src/main/java/org/spout/vanilla/event/player/network/PlayerBedEvent.java
index b69e52bbb..634d4464c 100644
--- a/src/main/java/org/spout/vanilla/event/player/network/PlayerBedEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/network/PlayerBedEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player.network;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/network/PlayerGameStateEvent.java b/src/main/java/org/spout/vanilla/event/player/network/PlayerGameStateEvent.java
index e45ee1447..b213d1130 100644
--- a/src/main/java/org/spout/vanilla/event/player/network/PlayerGameStateEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/network/PlayerGameStateEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player.network;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/network/PlayerHealthEvent.java b/src/main/java/org/spout/vanilla/event/player/network/PlayerHealthEvent.java
index 33c3367dd..1a0f31a00 100644
--- a/src/main/java/org/spout/vanilla/event/player/network/PlayerHealthEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/network/PlayerHealthEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player.network;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/network/PlayerListEvent.java b/src/main/java/org/spout/vanilla/event/player/network/PlayerListEvent.java
index 9d9f9f362..a125f257e 100644
--- a/src/main/java/org/spout/vanilla/event/player/network/PlayerListEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/network/PlayerListEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player.network;
 
diff --git a/src/main/java/org/spout/vanilla/event/player/network/PlayerPingEvent.java b/src/main/java/org/spout/vanilla/event/player/network/PlayerPingEvent.java
index 5479d4115..8de7bc038 100644
--- a/src/main/java/org/spout/vanilla/event/player/network/PlayerPingEvent.java
+++ b/src/main/java/org/spout/vanilla/event/player/network/PlayerPingEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.player.network;
 
diff --git a/src/main/java/org/spout/vanilla/event/window/WindowCloseEvent.java b/src/main/java/org/spout/vanilla/event/window/WindowCloseEvent.java
index c3432eb56..45fc5c46b 100644
--- a/src/main/java/org/spout/vanilla/event/window/WindowCloseEvent.java
+++ b/src/main/java/org/spout/vanilla/event/window/WindowCloseEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.window;
 
diff --git a/src/main/java/org/spout/vanilla/event/window/WindowEvent.java b/src/main/java/org/spout/vanilla/event/window/WindowEvent.java
index c1c88c2bf..3810bf7c5 100644
--- a/src/main/java/org/spout/vanilla/event/window/WindowEvent.java
+++ b/src/main/java/org/spout/vanilla/event/window/WindowEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.window;
 
diff --git a/src/main/java/org/spout/vanilla/event/window/WindowItemsEvent.java b/src/main/java/org/spout/vanilla/event/window/WindowItemsEvent.java
index 520b23a43..7d4f7c241 100644
--- a/src/main/java/org/spout/vanilla/event/window/WindowItemsEvent.java
+++ b/src/main/java/org/spout/vanilla/event/window/WindowItemsEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.window;
 
diff --git a/src/main/java/org/spout/vanilla/event/window/WindowOpenEvent.java b/src/main/java/org/spout/vanilla/event/window/WindowOpenEvent.java
index 4657fb59a..a0a3cb85c 100644
--- a/src/main/java/org/spout/vanilla/event/window/WindowOpenEvent.java
+++ b/src/main/java/org/spout/vanilla/event/window/WindowOpenEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.window;
 
diff --git a/src/main/java/org/spout/vanilla/event/window/WindowPropertyEvent.java b/src/main/java/org/spout/vanilla/event/window/WindowPropertyEvent.java
index 9c8feba83..3dd48b04c 100644
--- a/src/main/java/org/spout/vanilla/event/window/WindowPropertyEvent.java
+++ b/src/main/java/org/spout/vanilla/event/window/WindowPropertyEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.window;
 
diff --git a/src/main/java/org/spout/vanilla/event/window/WindowSlotEvent.java b/src/main/java/org/spout/vanilla/event/window/WindowSlotEvent.java
index 90e41a86e..bc1f108ff 100644
--- a/src/main/java/org/spout/vanilla/event/window/WindowSlotEvent.java
+++ b/src/main/java/org/spout/vanilla/event/window/WindowSlotEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.window;
 
diff --git a/src/main/java/org/spout/vanilla/event/world/PlayExplosionEffectEvent.java b/src/main/java/org/spout/vanilla/event/world/PlayExplosionEffectEvent.java
index 24dcf4df5..1550a576f 100644
--- a/src/main/java/org/spout/vanilla/event/world/PlayExplosionEffectEvent.java
+++ b/src/main/java/org/spout/vanilla/event/world/PlayExplosionEffectEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.world;
 
diff --git a/src/main/java/org/spout/vanilla/event/world/PlayParticleEffectEvent.java b/src/main/java/org/spout/vanilla/event/world/PlayParticleEffectEvent.java
index 821e82b7c..e76be59f3 100644
--- a/src/main/java/org/spout/vanilla/event/world/PlayParticleEffectEvent.java
+++ b/src/main/java/org/spout/vanilla/event/world/PlayParticleEffectEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.world;
 
diff --git a/src/main/java/org/spout/vanilla/event/world/PlaySoundEffectEvent.java b/src/main/java/org/spout/vanilla/event/world/PlaySoundEffectEvent.java
index 013295836..6073c62e0 100644
--- a/src/main/java/org/spout/vanilla/event/world/PlaySoundEffectEvent.java
+++ b/src/main/java/org/spout/vanilla/event/world/PlaySoundEffectEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.world;
 
diff --git a/src/main/java/org/spout/vanilla/event/world/TimeUpdateEvent.java b/src/main/java/org/spout/vanilla/event/world/TimeUpdateEvent.java
index e18a36169..4aee38469 100644
--- a/src/main/java/org/spout/vanilla/event/world/TimeUpdateEvent.java
+++ b/src/main/java/org/spout/vanilla/event/world/TimeUpdateEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.world;
 
diff --git a/src/main/java/org/spout/vanilla/event/world/WeatherChangeEvent.java b/src/main/java/org/spout/vanilla/event/world/WeatherChangeEvent.java
index f94d5196b..4470a97e1 100644
--- a/src/main/java/org/spout/vanilla/event/world/WeatherChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/event/world/WeatherChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.event.world;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/Container.java b/src/main/java/org/spout/vanilla/inventory/Container.java
index af1ca7308..bdfc96a32 100644
--- a/src/main/java/org/spout/vanilla/inventory/Container.java
+++ b/src/main/java/org/spout/vanilla/inventory/Container.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/CraftingInventory.java b/src/main/java/org/spout/vanilla/inventory/CraftingInventory.java
index 2a35821e0..03f947eee 100644
--- a/src/main/java/org/spout/vanilla/inventory/CraftingInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/CraftingInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/AnvilInventory.java b/src/main/java/org/spout/vanilla/inventory/block/AnvilInventory.java
index 4a9a34551..217886ba9 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/AnvilInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/AnvilInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/BeaconInventory.java b/src/main/java/org/spout/vanilla/inventory/block/BeaconInventory.java
index 7009f94a0..9f87a67c5 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/BeaconInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/BeaconInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/BrewingStandInventory.java b/src/main/java/org/spout/vanilla/inventory/block/BrewingStandInventory.java
index 741c187c7..36e676dea 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/BrewingStandInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/BrewingStandInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/ChestInventory.java b/src/main/java/org/spout/vanilla/inventory/block/ChestInventory.java
index 317a7b138..c1300a42a 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/ChestInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/ChestInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/CraftingTableInventory.java b/src/main/java/org/spout/vanilla/inventory/block/CraftingTableInventory.java
index 9ff98dd81..a28090c5c 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/CraftingTableInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/CraftingTableInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/DispenserInventory.java b/src/main/java/org/spout/vanilla/inventory/block/DispenserInventory.java
index 466a82239..9b89dc33f 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/DispenserInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/DispenserInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/EnchantmentTableInventory.java b/src/main/java/org/spout/vanilla/inventory/block/EnchantmentTableInventory.java
index 124ac76c0..df9765f0f 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/EnchantmentTableInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/EnchantmentTableInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/FurnaceInventory.java b/src/main/java/org/spout/vanilla/inventory/block/FurnaceInventory.java
index 530e4ce91..3bab5d3fb 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/FurnaceInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/FurnaceInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/block/JukeboxInventory.java b/src/main/java/org/spout/vanilla/inventory/block/JukeboxInventory.java
index 6403516ce..be75a24b8 100644
--- a/src/main/java/org/spout/vanilla/inventory/block/JukeboxInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/block/JukeboxInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/entity/VillagerInventory.java b/src/main/java/org/spout/vanilla/inventory/entity/VillagerInventory.java
index 5ddf8f608..a8651d46f 100644
--- a/src/main/java/org/spout/vanilla/inventory/entity/VillagerInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/entity/VillagerInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.entity;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/player/PlayerArmorInventory.java b/src/main/java/org/spout/vanilla/inventory/player/PlayerArmorInventory.java
index 00dd36c85..e2b4d5894 100644
--- a/src/main/java/org/spout/vanilla/inventory/player/PlayerArmorInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/player/PlayerArmorInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.player;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/player/PlayerCraftingInventory.java b/src/main/java/org/spout/vanilla/inventory/player/PlayerCraftingInventory.java
index 625e649bc..5ea06609c 100644
--- a/src/main/java/org/spout/vanilla/inventory/player/PlayerCraftingInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/player/PlayerCraftingInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.player;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/player/PlayerMainInventory.java b/src/main/java/org/spout/vanilla/inventory/player/PlayerMainInventory.java
index a51da722d..ff2798d0f 100644
--- a/src/main/java/org/spout/vanilla/inventory/player/PlayerMainInventory.java
+++ b/src/main/java/org/spout/vanilla/inventory/player/PlayerMainInventory.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.player;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/player/PlayerQuickbar.java b/src/main/java/org/spout/vanilla/inventory/player/PlayerQuickbar.java
index d9272578d..9c6f43352 100644
--- a/src/main/java/org/spout/vanilla/inventory/player/PlayerQuickbar.java
+++ b/src/main/java/org/spout/vanilla/inventory/player/PlayerQuickbar.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.player;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/recipe/VanillaRecipes.java b/src/main/java/org/spout/vanilla/inventory/recipe/VanillaRecipes.java
index 3fbb9e1dd..5807eb845 100644
--- a/src/main/java/org/spout/vanilla/inventory/recipe/VanillaRecipes.java
+++ b/src/main/java/org/spout/vanilla/inventory/recipe/VanillaRecipes.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.recipe;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/util/GridInventoryConverter.java b/src/main/java/org/spout/vanilla/inventory/util/GridInventoryConverter.java
index d5530d5e2..edfb969f5 100644
--- a/src/main/java/org/spout/vanilla/inventory/util/GridInventoryConverter.java
+++ b/src/main/java/org/spout/vanilla/inventory/util/GridInventoryConverter.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.util;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/util/InventoryConverter.java b/src/main/java/org/spout/vanilla/inventory/util/InventoryConverter.java
index ed995f5fa..f129056a4 100644
--- a/src/main/java/org/spout/vanilla/inventory/util/InventoryConverter.java
+++ b/src/main/java/org/spout/vanilla/inventory/util/InventoryConverter.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.util;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/ClickArguments.java b/src/main/java/org/spout/vanilla/inventory/window/ClickArguments.java
index ebf1fe74e..d4dbc6091 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/ClickArguments.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/ClickArguments.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/DefaultWindow.java b/src/main/java/org/spout/vanilla/inventory/window/DefaultWindow.java
index ad62a4db8..751e7c21e 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/DefaultWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/DefaultWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/InventoryEntry.java b/src/main/java/org/spout/vanilla/inventory/window/InventoryEntry.java
index f58589101..72a767c4c 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/InventoryEntry.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/InventoryEntry.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/Window.java b/src/main/java/org/spout/vanilla/inventory/window/Window.java
index abb70c914..d3a54ae82 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/Window.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/Window.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/WindowType.java b/src/main/java/org/spout/vanilla/inventory/window/WindowType.java
index f8d6dbde9..fbe2515ca 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/WindowType.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/WindowType.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/AnvilWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/AnvilWindow.java
index 2f87a4260..24d96fdbe 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/AnvilWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/AnvilWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/BeaconWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/BeaconWindow.java
index bd5c2cbde..7e826f0b3 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/BeaconWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/BeaconWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/BrewingStandWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/BrewingStandWindow.java
index b615459d8..470c85853 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/BrewingStandWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/BrewingStandWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/CraftingTableWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/CraftingTableWindow.java
index 8cfa95688..535eb4944 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/CraftingTableWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/CraftingTableWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/DispenserWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/DispenserWindow.java
index c150f64db..87e384822 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/DispenserWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/DispenserWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/EnchantmentTableWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/EnchantmentTableWindow.java
index dae5fed10..803c6a928 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/EnchantmentTableWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/EnchantmentTableWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/FurnaceWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/FurnaceWindow.java
index ff57b1397..981a33736 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/FurnaceWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/FurnaceWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/chest/AbstractChestWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/chest/AbstractChestWindow.java
index d370f2bb4..877ef325c 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/chest/AbstractChestWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/chest/AbstractChestWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block.chest;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/chest/ChestWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/chest/ChestWindow.java
index 904422fe5..0ad65352e 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/chest/ChestWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/chest/ChestWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block.chest;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/block/chest/EnderChestWindow.java b/src/main/java/org/spout/vanilla/inventory/window/block/chest/EnderChestWindow.java
index 84ed30534..1dd9f0f60 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/block/chest/EnderChestWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/block/chest/EnderChestWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.block.chest;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/entity/VillagerWindow.java b/src/main/java/org/spout/vanilla/inventory/window/entity/VillagerWindow.java
index e7cd8c48b..e0efa0953 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/entity/VillagerWindow.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/entity/VillagerWindow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.entity;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/gui/InventorySlot.java b/src/main/java/org/spout/vanilla/inventory/window/gui/InventorySlot.java
index 2cdb98ac7..0772b132a 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/gui/InventorySlot.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/gui/InventorySlot.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.gui;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/gui/RenderItemStack.java b/src/main/java/org/spout/vanilla/inventory/window/gui/RenderItemStack.java
index ac630a698..e1771bf39 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/gui/RenderItemStack.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/gui/RenderItemStack.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.gui;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/prop/EnchantmentTableProperty.java b/src/main/java/org/spout/vanilla/inventory/window/prop/EnchantmentTableProperty.java
index fbcde06bd..32da09002 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/prop/EnchantmentTableProperty.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/prop/EnchantmentTableProperty.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.prop;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/prop/FurnaceProperty.java b/src/main/java/org/spout/vanilla/inventory/window/prop/FurnaceProperty.java
index f1f7c0d9f..499e19556 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/prop/FurnaceProperty.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/prop/FurnaceProperty.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.prop;
 
diff --git a/src/main/java/org/spout/vanilla/inventory/window/prop/WindowProperty.java b/src/main/java/org/spout/vanilla/inventory/window/prop/WindowProperty.java
index 68e26f41f..5b6a5ed43 100644
--- a/src/main/java/org/spout/vanilla/inventory/window/prop/WindowProperty.java
+++ b/src/main/java/org/spout/vanilla/inventory/window/prop/WindowProperty.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.inventory.window.prop;
 
diff --git a/src/main/java/org/spout/vanilla/material/Burnable.java b/src/main/java/org/spout/vanilla/material/Burnable.java
index ba23c4db6..6ab6ac3c7 100644
--- a/src/main/java/org/spout/vanilla/material/Burnable.java
+++ b/src/main/java/org/spout/vanilla/material/Burnable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/Fuel.java b/src/main/java/org/spout/vanilla/material/Fuel.java
index a7e0c5548..e9db1865e 100644
--- a/src/main/java/org/spout/vanilla/material/Fuel.java
+++ b/src/main/java/org/spout/vanilla/material/Fuel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/InitializableMaterial.java b/src/main/java/org/spout/vanilla/material/InitializableMaterial.java
index 2d662e507..e6fcb7a1f 100644
--- a/src/main/java/org/spout/vanilla/material/InitializableMaterial.java
+++ b/src/main/java/org/spout/vanilla/material/InitializableMaterial.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/TimedCraftable.java b/src/main/java/org/spout/vanilla/material/TimedCraftable.java
index 2599bbecc..636f2a2dc 100644
--- a/src/main/java/org/spout/vanilla/material/TimedCraftable.java
+++ b/src/main/java/org/spout/vanilla/material/TimedCraftable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/Toggleable.java b/src/main/java/org/spout/vanilla/material/Toggleable.java
index 116b6f668..060a0a097 100644
--- a/src/main/java/org/spout/vanilla/material/Toggleable.java
+++ b/src/main/java/org/spout/vanilla/material/Toggleable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/VanillaBlockMaterial.java b/src/main/java/org/spout/vanilla/material/VanillaBlockMaterial.java
index c4b981027..dab6fee4e 100644
--- a/src/main/java/org/spout/vanilla/material/VanillaBlockMaterial.java
+++ b/src/main/java/org/spout/vanilla/material/VanillaBlockMaterial.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/VanillaMaterial.java b/src/main/java/org/spout/vanilla/material/VanillaMaterial.java
index b4b4a197d..5f6ac6065 100644
--- a/src/main/java/org/spout/vanilla/material/VanillaMaterial.java
+++ b/src/main/java/org/spout/vanilla/material/VanillaMaterial.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
diff --git a/src/main/java/org/spout/vanilla/material/VanillaMaterials.java b/src/main/java/org/spout/vanilla/material/VanillaMaterials.java
index 5fb57f99f..d272a1637 100644
--- a/src/main/java/org/spout/vanilla/material/VanillaMaterials.java
+++ b/src/main/java/org/spout/vanilla/material/VanillaMaterials.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material;
 
@@ -282,10 +282,10 @@ public final class VanillaMaterials {
 	public static final TallGrass TALL_GRASS = TallGrass.TALL_GRASS;
 	public static final DeadBush DEAD_BUSH = new DeadBush("Dead Shrubs", 32);
 	public static final Sapling SAPLING = Sapling.DEFAULT;
-	public static final Flower DANDELION = new Flower("Dandelion", 37, "model://Vanilla/resources/materials/block/nonsolid/dandelion/dandelion.spm");
-	public static final Flower ROSE = new Flower("Rose", 38, "model://Vanilla/resources/materials/block/nonsolid/rose/rose.spm");
-	public static final Mushroom BROWN_MUSHROOM = new Mushroom("Brown Mushroom", 39, "model://Vanilla/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm");
-	public static final Mushroom RED_MUSHROOM = new Mushroom("Red Mushroom", 40, "model://Vanilla/resources/materials/block/nonsolid/redmushroom/redmushroom.spm");
+	public static final Flower DANDELION = new Flower("Dandelion", 37, "model://Vanilla/materials/block/nonsolid/dandelion/dandelion.spm");
+	public static final Flower ROSE = new Flower("Rose", 38, "model://Vanilla/materials/block/nonsolid/rose/rose.spm");
+	public static final Mushroom BROWN_MUSHROOM = new Mushroom("Brown Mushroom", 39, "model://Vanilla/materials/block/nonsolid/brownmushroom/brownmushroom.spm");
+	public static final Mushroom RED_MUSHROOM = new Mushroom("Red Mushroom", 40, "model://Vanilla/materials/block/nonsolid/redmushroom/redmushroom.spm");
 	// == Stairs ==
 	public static final NetherBrickStairs STAIRS_NETHER_BRICK = new NetherBrickStairs("Nether Brick Stairs", 114);
 	public static final BrickStairs STAIRS_BRICK = new BrickStairs("Brick Stairs", 108);
@@ -369,8 +369,8 @@ public final class VanillaMaterials {
 	public static final BrewingStandBlock BREWING_STAND_BLOCK = new BrewingStandBlock("Brewing Stand", 117);
 	public static final CauldronBlock CAULDRON_BLOCK = new CauldronBlock("Cauldron", 118);
 	public static final DragonEgg DRAGON_EGG = new DragonEgg("Dragon Egg", 122);
-	public static final RedstoneLamp REDSTONE_LAMP_OFF = new RedstoneLamp("Redstone Lamp", 123, false, "model://Vanilla/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm");
-	public static final RedstoneLamp REDSTONE_LAMP_ON = new RedstoneLamp("Redstone Lamp (On)", 124, true, "model://Vanilla/resources/materials/block/solid/redstonelampon/redstonelampon.spm");
+	public static final RedstoneLamp REDSTONE_LAMP_OFF = new RedstoneLamp("Redstone Lamp", 123, false, "model://Vanilla/materials/block/solid/redstonelampoff/redstonelampoff.spm");
+	public static final RedstoneLamp REDSTONE_LAMP_ON = new RedstoneLamp("Redstone Lamp (On)", 124, true, "model://Vanilla/materials/block/solid/redstonelampon/redstonelampon.spm");
 	public static final TripWireHook TRIPWIRE_HOOK = new TripWireHook("Trip Wire Hook", 131);
 	public static final TripWire TRIPWIRE = new TripWire("Trip Wire", 132);
 	public static final CocoaPlant COCOA_PLANT = new CocoaPlant("Cocoa Plant", 127);
diff --git a/src/main/java/org/spout/vanilla/material/block/Attachable.java b/src/main/java/org/spout/vanilla/material/block/Attachable.java
index f194ae4c9..bbcbad434 100644
--- a/src/main/java/org/spout/vanilla/material/block/Attachable.java
+++ b/src/main/java/org/spout/vanilla/material/block/Attachable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/AttachedRedstoneSource.java b/src/main/java/org/spout/vanilla/material/block/AttachedRedstoneSource.java
index 13a8d9151..827016eb9 100644
--- a/src/main/java/org/spout/vanilla/material/block/AttachedRedstoneSource.java
+++ b/src/main/java/org/spout/vanilla/material/block/AttachedRedstoneSource.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Crop.java b/src/main/java/org/spout/vanilla/material/block/Crop.java
index b1be8c007..8f3b84978 100644
--- a/src/main/java/org/spout/vanilla/material/block/Crop.java
+++ b/src/main/java/org/spout/vanilla/material/block/Crop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Directional.java b/src/main/java/org/spout/vanilla/material/block/Directional.java
index b1be4e7dc..2aa1bfca9 100644
--- a/src/main/java/org/spout/vanilla/material/block/Directional.java
+++ b/src/main/java/org/spout/vanilla/material/block/Directional.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/DoorBlock.java b/src/main/java/org/spout/vanilla/material/block/DoorBlock.java
index 38c1f6ad6..d408efdf9 100644
--- a/src/main/java/org/spout/vanilla/material/block/DoorBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/DoorBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Fence.java b/src/main/java/org/spout/vanilla/material/block/Fence.java
index 2db98f062..ed1f1f8c6 100644
--- a/src/main/java/org/spout/vanilla/material/block/Fence.java
+++ b/src/main/java/org/spout/vanilla/material/block/Fence.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Growing.java b/src/main/java/org/spout/vanilla/material/block/Growing.java
index c17d3c85e..b189f52c5 100644
--- a/src/main/java/org/spout/vanilla/material/block/Growing.java
+++ b/src/main/java/org/spout/vanilla/material/block/Growing.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Liquid.java b/src/main/java/org/spout/vanilla/material/block/Liquid.java
index 1bdd2c94d..4000edf54 100644
--- a/src/main/java/org/spout/vanilla/material/block/Liquid.java
+++ b/src/main/java/org/spout/vanilla/material/block/Liquid.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Openable.java b/src/main/java/org/spout/vanilla/material/block/Openable.java
index 5c48510b0..caf802886 100644
--- a/src/main/java/org/spout/vanilla/material/block/Openable.java
+++ b/src/main/java/org/spout/vanilla/material/block/Openable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Ore.java b/src/main/java/org/spout/vanilla/material/block/Ore.java
index 7f8bfe806..2871e8dec 100644
--- a/src/main/java/org/spout/vanilla/material/block/Ore.java
+++ b/src/main/java/org/spout/vanilla/material/block/Ore.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Plant.java b/src/main/java/org/spout/vanilla/material/block/Plant.java
index 9b7d9237a..4c4e93885 100644
--- a/src/main/java/org/spout/vanilla/material/block/Plant.java
+++ b/src/main/java/org/spout/vanilla/material/block/Plant.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Portal.java b/src/main/java/org/spout/vanilla/material/block/Portal.java
index 7da5f69da..32fbdf84a 100644
--- a/src/main/java/org/spout/vanilla/material/block/Portal.java
+++ b/src/main/java/org/spout/vanilla/material/block/Portal.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/PressurePlate.java b/src/main/java/org/spout/vanilla/material/block/PressurePlate.java
index bbc29f7f5..343713897 100644
--- a/src/main/java/org/spout/vanilla/material/block/PressurePlate.java
+++ b/src/main/java/org/spout/vanilla/material/block/PressurePlate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ScheduleUpdated.java b/src/main/java/org/spout/vanilla/material/block/ScheduleUpdated.java
index b8d6ee97c..e950e2d09 100644
--- a/src/main/java/org/spout/vanilla/material/block/ScheduleUpdated.java
+++ b/src/main/java/org/spout/vanilla/material/block/ScheduleUpdated.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Solid.java b/src/main/java/org/spout/vanilla/material/block/Solid.java
index 8370cd2ad..111e3fb05 100644
--- a/src/main/java/org/spout/vanilla/material/block/Solid.java
+++ b/src/main/java/org/spout/vanilla/material/block/Solid.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/SolidMoving.java b/src/main/java/org/spout/vanilla/material/block/SolidMoving.java
index 0371915b3..06f206889 100644
--- a/src/main/java/org/spout/vanilla/material/block/SolidMoving.java
+++ b/src/main/java/org/spout/vanilla/material/block/SolidMoving.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Spreading.java b/src/main/java/org/spout/vanilla/material/block/Spreading.java
index fb4f254d8..dbc0c336e 100644
--- a/src/main/java/org/spout/vanilla/material/block/Spreading.java
+++ b/src/main/java/org/spout/vanilla/material/block/Spreading.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/SpreadingSolid.java b/src/main/java/org/spout/vanilla/material/block/SpreadingSolid.java
index fb2b701a0..e107ff17c 100644
--- a/src/main/java/org/spout/vanilla/material/block/SpreadingSolid.java
+++ b/src/main/java/org/spout/vanilla/material/block/SpreadingSolid.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/Stairs.java b/src/main/java/org/spout/vanilla/material/block/Stairs.java
index 5e6ab068c..583dd41f0 100644
--- a/src/main/java/org/spout/vanilla/material/block/Stairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/Stairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/attachable/AbstractAttachable.java b/src/main/java/org/spout/vanilla/material/block/attachable/AbstractAttachable.java
index 559b89f30..3b32b1654 100644
--- a/src/main/java/org/spout/vanilla/material/block/attachable/AbstractAttachable.java
+++ b/src/main/java/org/spout/vanilla/material/block/attachable/AbstractAttachable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.attachable;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/attachable/GroundAttachable.java b/src/main/java/org/spout/vanilla/material/block/attachable/GroundAttachable.java
index 8d9e93d05..c0c4c9030 100644
--- a/src/main/java/org/spout/vanilla/material/block/attachable/GroundAttachable.java
+++ b/src/main/java/org/spout/vanilla/material/block/attachable/GroundAttachable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.attachable;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/attachable/PointAttachable.java b/src/main/java/org/spout/vanilla/material/block/attachable/PointAttachable.java
index f466e6946..a89bc380b 100644
--- a/src/main/java/org/spout/vanilla/material/block/attachable/PointAttachable.java
+++ b/src/main/java/org/spout/vanilla/material/block/attachable/PointAttachable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.attachable;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/AnvilBlock.java b/src/main/java/org/spout/vanilla/material/block/component/AnvilBlock.java
index 3aad0655a..ac675fd85 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/AnvilBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/AnvilBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/BeaconBlock.java b/src/main/java/org/spout/vanilla/material/block/component/BeaconBlock.java
index 2ec8a2e7c..81f3aff3f 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/BeaconBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/BeaconBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/BrewingStandBlock.java b/src/main/java/org/spout/vanilla/material/block/component/BrewingStandBlock.java
index 0b63e6547..725def435 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/BrewingStandBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/BrewingStandBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/ComponentMaterial.java b/src/main/java/org/spout/vanilla/material/block/component/ComponentMaterial.java
index 3675315da..000ab938d 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/ComponentMaterial.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/ComponentMaterial.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/CraftingTableBlock.java b/src/main/java/org/spout/vanilla/material/block/component/CraftingTableBlock.java
index 8044e4921..2e23a94cf 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/CraftingTableBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/CraftingTableBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
@@ -39,7 +39,7 @@
 
 public class CraftingTableBlock extends Solid {
 	public CraftingTableBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/craftingtable/craftingtable.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/craftingtable/craftingtable.spm");
 		this.setHardness(4.2F);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/DispenserBlock.java b/src/main/java/org/spout/vanilla/material/block/component/DispenserBlock.java
index 7d9604095..68c41b4cc 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/DispenserBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/DispenserBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
@@ -56,7 +56,7 @@
 
 public class DispenserBlock extends ComponentMaterial implements Directional, RedstoneTarget {
 	public DispenserBlock(String name, int id) {
-		super(name, id, Dispenser.class, "model://Vanilla/resources/materials/block/solid/dispenser/dispenser.spm");
+		super(name, id, Dispenser.class, "model://Vanilla/materials/block/solid/dispenser/dispenser.spm");
 		this.setHardness(3.5F).setResistance(5.8F);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/EnchantmentTableBlock.java b/src/main/java/org/spout/vanilla/material/block/component/EnchantmentTableBlock.java
index c5b3ef682..c21991ed1 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/EnchantmentTableBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/EnchantmentTableBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/FurnaceBlock.java b/src/main/java/org/spout/vanilla/material/block/component/FurnaceBlock.java
index 8a3ef9016..e5eee9ec6 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/FurnaceBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/FurnaceBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
@@ -44,7 +44,7 @@ public class FurnaceBlock extends ComponentMaterial implements Directional {
 	private final boolean burning;
 
 	public FurnaceBlock(String name, int id, boolean burning) {
-		super(name, id, Furnace.class, "model://Vanilla/resources/materials/block/solid/furnace/furnace.spm");
+		super(name, id, Furnace.class, "model://Vanilla/materials/block/solid/furnace/furnace.spm");
 		this.burning = burning;
 		this.setHardness(3.5F).setResistance(5.8F);
 		this.getDrops().NOT_CREATIVE.addFlags(ToolTypeFlags.PICKAXE);
diff --git a/src/main/java/org/spout/vanilla/material/block/component/JukeboxBlock.java b/src/main/java/org/spout/vanilla/material/block/component/JukeboxBlock.java
index 9b2ef3d39..d822e1940 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/JukeboxBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/JukeboxBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
@@ -38,7 +38,7 @@ public class JukeboxBlock extends ComponentMaterial implements Fuel {
 	public final float BURN_TIME = 15;
 
 	public JukeboxBlock(String name, int id) {
-		super(name, id, Jukebox.class, "model://Vanilla/resources/materials/block/solid/jukebox/jukebox.spm");
+		super(name, id, Jukebox.class, "model://Vanilla/materials/block/solid/jukebox/jukebox.spm");
 		this.setHardness(2.0F).setResistance(10.0F);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/MonsterSpawnerBlock.java b/src/main/java/org/spout/vanilla/material/block/component/MonsterSpawnerBlock.java
index e3906f51c..1f2bb2e76 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/MonsterSpawnerBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/MonsterSpawnerBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
@@ -30,7 +30,7 @@
 
 public class MonsterSpawnerBlock extends ComponentMaterial {
 	public MonsterSpawnerBlock(String name, int id) {
-		super(name, id, MonsterSpawner.class, "model://Vanilla/resources/materials/block/solid/mobspawner/mobspawner.spm");
+		super(name, id, MonsterSpawner.class, "model://Vanilla/materials/block/solid/mobspawner/mobspawner.spm");
 		this.setHardness(5.0F).setResistance(8.3F).setTransparent();
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/material/block/component/NoteBlockBlock.java b/src/main/java/org/spout/vanilla/material/block/component/NoteBlockBlock.java
index ca50a1915..7a711143c 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/NoteBlockBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/NoteBlockBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
@@ -39,7 +39,7 @@ public class NoteBlockBlock extends ComponentMaterial implements Fuel {
 	public final float BURN_TIME = 15;
 
 	public NoteBlockBlock(String name, int id) {
-		super(name, id, NoteBlock.class, "model://Vanilla/resources/materials/block/solid/noteblock/noteblock.spm");
+		super(name, id, NoteBlock.class, "model://Vanilla/materials/block/solid/noteblock/noteblock.spm");
 		this.setHardness(0.8F).setResistance(1.3F);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/PistonExtensionMoving.java b/src/main/java/org/spout/vanilla/material/block/component/PistonExtensionMoving.java
index f83fc520d..609cef2d2 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/PistonExtensionMoving.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/PistonExtensionMoving.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/SignBase.java b/src/main/java/org/spout/vanilla/material/block/component/SignBase.java
index b762a1ebb..278951a63 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/SignBase.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/SignBase.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/SignPost.java b/src/main/java/org/spout/vanilla/material/block/component/SignPost.java
index 14b0d58e5..b474cf681 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/SignPost.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/SignPost.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/SkullBlock.java b/src/main/java/org/spout/vanilla/material/block/component/SkullBlock.java
index 8f99df6fe..d2b62fe01 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/SkullBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/SkullBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/VanillaComplexMaterial.java b/src/main/java/org/spout/vanilla/material/block/component/VanillaComplexMaterial.java
index 5124e0bcb..6bb7e4af2 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/VanillaComplexMaterial.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/VanillaComplexMaterial.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/WallSign.java b/src/main/java/org/spout/vanilla/material/block/component/WallSign.java
index 84d4e3d61..a6778bd9b 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/WallSign.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/WallSign.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/chest/AbstractChestBlock.java b/src/main/java/org/spout/vanilla/material/block/component/chest/AbstractChestBlock.java
index b6e284756..8ae4717e1 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/chest/AbstractChestBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/chest/AbstractChestBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component.chest;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/chest/ChestBlock.java b/src/main/java/org/spout/vanilla/material/block/component/chest/ChestBlock.java
index 1bf1e5143..47db59cc1 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/chest/ChestBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/chest/ChestBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component.chest;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/component/chest/EnderChestBlock.java b/src/main/java/org/spout/vanilla/material/block/component/chest/EnderChestBlock.java
index d9fe28b23..06acb7d10 100644
--- a/src/main/java/org/spout/vanilla/material/block/component/chest/EnderChestBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/component/chest/EnderChestBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.component.chest;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/door/IronDoorBlock.java b/src/main/java/org/spout/vanilla/material/block/door/IronDoorBlock.java
index e5a6d484e..9e4fb7c6e 100644
--- a/src/main/java/org/spout/vanilla/material/block/door/IronDoorBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/door/IronDoorBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.door;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/door/WoodenDoorBlock.java b/src/main/java/org/spout/vanilla/material/block/door/WoodenDoorBlock.java
index f35b6fe81..b777e03ae 100644
--- a/src/main/java/org/spout/vanilla/material/block/door/WoodenDoorBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/door/WoodenDoorBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.door;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/fence/NetherBrickFence.java b/src/main/java/org/spout/vanilla/material/block/fence/NetherBrickFence.java
index a7afbfa9b..b12c9d19c 100644
--- a/src/main/java/org/spout/vanilla/material/block/fence/NetherBrickFence.java
+++ b/src/main/java/org/spout/vanilla/material/block/fence/NetherBrickFence.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.fence;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/fence/Wall.java b/src/main/java/org/spout/vanilla/material/block/fence/Wall.java
index 8ab7d4aa1..c573c93c7 100644
--- a/src/main/java/org/spout/vanilla/material/block/fence/Wall.java
+++ b/src/main/java/org/spout/vanilla/material/block/fence/Wall.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.fence;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/fence/WoodenFence.java b/src/main/java/org/spout/vanilla/material/block/fence/WoodenFence.java
index 84498904e..bff83b98c 100644
--- a/src/main/java/org/spout/vanilla/material/block/fence/WoodenFence.java
+++ b/src/main/java/org/spout/vanilla/material/block/fence/WoodenFence.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.fence;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/liquid/Lava.java b/src/main/java/org/spout/vanilla/material/block/liquid/Lava.java
index 7c18c2c14..efc592111 100644
--- a/src/main/java/org/spout/vanilla/material/block/liquid/Lava.java
+++ b/src/main/java/org/spout/vanilla/material/block/liquid/Lava.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.liquid;
 
@@ -41,7 +41,7 @@
 
 public class Lava extends Liquid {
 	public Lava(String name, int id, boolean flowing) {
-		super(name, id, flowing, "model://Vanilla/resources/materials/block/liquid/lava/lava.spm");
+		super(name, id, flowing, "model://Vanilla/materials/block/liquid/lava/lava.spm");
 		this.setFlowDelay(1500);
 		if (Spout.getEngine().getPlatform() == Platform.CLIENT) {
 			if (!getModel().getRenderMaterial().getRenderEffects().contains(VanillaEffects.LIQUID)) {
diff --git a/src/main/java/org/spout/vanilla/material/block/liquid/Water.java b/src/main/java/org/spout/vanilla/material/block/liquid/Water.java
index 020b55bc5..3fa95e282 100644
--- a/src/main/java/org/spout/vanilla/material/block/liquid/Water.java
+++ b/src/main/java/org/spout/vanilla/material/block/liquid/Water.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.liquid;
 
@@ -44,7 +44,7 @@
 
 public class Water extends Liquid implements DynamicMaterial {
 	public Water(String name, int id, boolean flowing) {
-		super(name, id, flowing, "model://Vanilla/resources/materials/block/liquid/water/water.spm");
+		super(name, id, flowing, "model://Vanilla/materials/block/liquid/water/water.spm");
 		this.setFlowDelay(250);
 		if (Spout.getEngine().getPlatform() == Platform.CLIENT) {
 			if (!getModel().getRenderMaterial().getBufferEffects().contains(VanillaEffects.BIOME_WATER_COLOR)) {
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/BedBlock.java b/src/main/java/org/spout/vanilla/material/block/misc/BedBlock.java
index 744c7e778..3e82e9296 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/BedBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/BedBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
@@ -59,7 +59,7 @@ public class BedBlock extends VanillaBlockMaterial implements InitializableMater
 	public static final ChatArguments OCCUPIED_MESSAGE = new ChatArguments(ChatStyle.RED, "This bed is occupied.");
 
 	public BedBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/bedrock/bedrock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/bedrock/bedrock.spm");
 		this.setHardness(0.2F).setResistance(0.3F).setTransparent();
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/CakeBlock.java b/src/main/java/org/spout/vanilla/material/block/misc/CakeBlock.java
index eb5da35c4..41cbeff78 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/CakeBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/CakeBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/CommandBlock.java b/src/main/java/org/spout/vanilla/material/block/misc/CommandBlock.java
index aeb5482b8..e19e4fbf5 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/CommandBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/CommandBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/DragonEgg.java b/src/main/java/org/spout/vanilla/material/block/misc/DragonEgg.java
index 67a0b5000..7911460ce 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/DragonEgg.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/DragonEgg.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/EndPortalFrame.java b/src/main/java/org/spout/vanilla/material/block/misc/EndPortalFrame.java
index 74c57af3c..44581633c 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/EndPortalFrame.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/EndPortalFrame.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/FarmLand.java b/src/main/java/org/spout/vanilla/material/block/misc/FarmLand.java
index 15a0d23d3..df1ce6ae9 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/FarmLand.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/FarmLand.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
@@ -45,7 +45,7 @@ public class FarmLand extends VanillaBlockMaterial implements InitializableMater
 	private static final EffectRange CROP_CHECK_RANGE = new CuboidEffectRange(-1, 1, -1, 1, 1, 1);
 
 	public FarmLand(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/farmland/farmland.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/farmland/farmland.spm");
 		this.setHardness(0.6F).setResistance(1.0F).setOpaque();
 		this.addMiningType(ToolType.SPADE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/FenceGate.java b/src/main/java/org/spout/vanilla/material/block/misc/FenceGate.java
index a462a67f6..7b7c0af3c 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/FenceGate.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/FenceGate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Fire.java b/src/main/java/org/spout/vanilla/material/block/misc/Fire.java
index 89962c3f9..93cfb5b08 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Fire.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Fire.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/FlowerPotBlock.java b/src/main/java/org/spout/vanilla/material/block/misc/FlowerPotBlock.java
index 68ed69160..77cf98faf 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/FlowerPotBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/FlowerPotBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/GlassPane.java b/src/main/java/org/spout/vanilla/material/block/misc/GlassPane.java
index 90dd1faf3..72d078977 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/GlassPane.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/GlassPane.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Ladder.java b/src/main/java/org/spout/vanilla/material/block/misc/Ladder.java
index b52dab08d..e3f52d6b7 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Ladder.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Ladder.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Lever.java b/src/main/java/org/spout/vanilla/material/block/misc/Lever.java
index 787b1c154..ed9c04707 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Lever.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Lever.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Slab.java b/src/main/java/org/spout/vanilla/material/block/misc/Slab.java
index eba70ab67..7a3526849 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Slab.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Slab.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Snow.java b/src/main/java/org/spout/vanilla/material/block/misc/Snow.java
index d64289e25..1c19be0b8 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Snow.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Snow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
@@ -45,14 +45,14 @@ public class Snow extends GroundAttachable implements DynamicMaterial, Initializ
 	public static final Snow[] SNOW = new Snow[8];
 
 	static {
-		SNOW[0] = new Snow("Snow", 78, "model://Vanilla/resources/materials/block/nonsolid/snow/snow_1.spm");
-		SNOW[1] = new Snow("Snow_1", 1, SNOW[0], "model://Vanilla/resources/materials/block/nonsolid/snow/snow_2.spm");
-		SNOW[2] = new Snow("Snow_2", 2, SNOW[0], "model://Vanilla/resources/materials/block/nonsolid/snow/snow_3.spm");
-		SNOW[3] = new Snow("Snow_3", 3, SNOW[0], "model://Vanilla/resources/materials/block/nonsolid/snow/snow_4.spm");
-		SNOW[4] = new Snow("Snow_4", 4, SNOW[0], "model://Vanilla/resources/materials/block/nonsolid/snow/snow_5.spm");
-		SNOW[5] = new Snow("Snow_5", 5, SNOW[0], "model://Vanilla/resources/materials/block/nonsolid/snow/snow_6.spm");
-		SNOW[6] = new Snow("Snow_6", 6, SNOW[0], "model://Vanilla/resources/materials/block/nonsolid/snow/snow_7.spm");
-		SNOW[7] = new Snow("Snow_7", 7, SNOW[0], "model://Vanilla/resources/materials/block/solid/snowblock/snowblock.spm");
+		SNOW[0] = new Snow("Snow", 78, "model://Vanilla/materials/block/nonsolid/snow/snow_1.spm");
+		SNOW[1] = new Snow("Snow_1", 1, SNOW[0], "model://Vanilla/materials/block/nonsolid/snow/snow_2.spm");
+		SNOW[2] = new Snow("Snow_2", 2, SNOW[0], "model://Vanilla/materials/block/nonsolid/snow/snow_3.spm");
+		SNOW[3] = new Snow("Snow_3", 3, SNOW[0], "model://Vanilla/materials/block/nonsolid/snow/snow_4.spm");
+		SNOW[4] = new Snow("Snow_4", 4, SNOW[0], "model://Vanilla/materials/block/nonsolid/snow/snow_5.spm");
+		SNOW[5] = new Snow("Snow_5", 5, SNOW[0], "model://Vanilla/materials/block/nonsolid/snow/snow_6.spm");
+		SNOW[6] = new Snow("Snow_6", 6, SNOW[0], "model://Vanilla/materials/block/nonsolid/snow/snow_7.spm");
+		SNOW[7] = new Snow("Snow_7", 7, SNOW[0], "model://Vanilla/materials/block/solid/snowblock/snowblock.spm");
 	}
 
 	public Snow(String name, int id, String model) {
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/StoneButton.java b/src/main/java/org/spout/vanilla/material/block/misc/StoneButton.java
index bc0ae082b..8e19ef829 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/StoneButton.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/StoneButton.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/TntBlock.java b/src/main/java/org/spout/vanilla/material/block/misc/TntBlock.java
index 264e4ccb0..af199ce1a 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/TntBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/TntBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
@@ -43,7 +43,7 @@
 
 public class TntBlock extends Solid implements RedstoneTarget, Burnable {
 	public TntBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/tnt/tnt.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/tnt/tnt.spm");
 		this.setHardness(0.0F).setResistance(0.0F).setOpacity((byte) 1);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Torch.java b/src/main/java/org/spout/vanilla/material/block/misc/Torch.java
index c5555afe8..ec559352f 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Torch.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Torch.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/TrapDoor.java b/src/main/java/org/spout/vanilla/material/block/misc/TrapDoor.java
index b4a534eac..ea0d06b13 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/TrapDoor.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/TrapDoor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/TripWire.java b/src/main/java/org/spout/vanilla/material/block/misc/TripWire.java
index afa734668..9d077ed1c 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/TripWire.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/TripWire.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/TripWireHook.java b/src/main/java/org/spout/vanilla/material/block/misc/TripWireHook.java
index d1dca971c..a15753a97 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/TripWireHook.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/TripWireHook.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/Web.java b/src/main/java/org/spout/vanilla/material/block/misc/Web.java
index b90ddfdff..0e23d4220 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/Web.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/Web.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/misc/WoodButton.java b/src/main/java/org/spout/vanilla/material/block/misc/WoodButton.java
index 0c1d11478..8c50b3d02 100644
--- a/src/main/java/org/spout/vanilla/material/block/misc/WoodButton.java
+++ b/src/main/java/org/spout/vanilla/material/block/misc/WoodButton.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/CoalOre.java b/src/main/java/org/spout/vanilla/material/block/ore/CoalOre.java
index b6888677d..1634a42d8 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/CoalOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/CoalOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -38,7 +38,7 @@
 
 public class CoalOre extends Ore implements TimedCraftable, InitializableMaterial {
 	public CoalOre(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/coalore/coalore.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/coalore/coalore.spm");
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.WOOD);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/DiamondBlock.java b/src/main/java/org/spout/vanilla/material/block/ore/DiamondBlock.java
index 161679141..a1ae6b28d 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/DiamondBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/DiamondBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -32,7 +32,7 @@
 
 public class DiamondBlock extends Solid {
 	public DiamondBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/diamondblock/diamondblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/diamondblock/diamondblock.spm");
 		this.setHardness(5.0F).setResistance(10.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.IRON);
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/DiamondOre.java b/src/main/java/org/spout/vanilla/material/block/ore/DiamondOre.java
index 6d94929f8..017e46e09 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/DiamondOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/DiamondOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -38,7 +38,7 @@
 
 public class DiamondOre extends Ore implements InitializableMaterial, TimedCraftable {
 	public DiamondOre(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/diamondore/diamondore.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/diamondore/diamondore.spm");
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.IRON);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/EmeraldBlock.java b/src/main/java/org/spout/vanilla/material/block/ore/EmeraldBlock.java
index 95fa49a96..d8bc49a20 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/EmeraldBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/EmeraldBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/EmeraldOre.java b/src/main/java/org/spout/vanilla/material/block/ore/EmeraldOre.java
index 01e8997b9..2e3405171 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/EmeraldOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/EmeraldOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/Glowstone.java b/src/main/java/org/spout/vanilla/material/block/ore/Glowstone.java
index 759b7dae4..bf7493784 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/Glowstone.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/Glowstone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -36,7 +36,7 @@
 
 public class Glowstone extends Ore implements InitializableMaterial {
 	public Glowstone(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/glowstone/glowstone.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/glowstone/glowstone.spm");
 		this.setHardness(0.3F).setResistance(0.5F);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/GoldBlock.java b/src/main/java/org/spout/vanilla/material/block/ore/GoldBlock.java
index 6083364ad..e382edcf7 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/GoldBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/GoldBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -32,7 +32,7 @@
 
 public class GoldBlock extends Solid {
 	public GoldBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/goldblock/goldblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/goldblock/goldblock.spm");
 		this.setHardness(3.0F).setResistance(10.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.IRON);
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/GoldOre.java b/src/main/java/org/spout/vanilla/material/block/ore/GoldOre.java
index 67bf742e1..db5e8e51a 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/GoldOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/GoldOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -37,7 +37,7 @@
 
 public class GoldOre extends Ore implements TimedCraftable {
 	public GoldOre(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/goldore/goldore.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/goldore/goldore.spm");
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.IRON);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/IronBlock.java b/src/main/java/org/spout/vanilla/material/block/ore/IronBlock.java
index 16091cd65..931f0e3ca 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/IronBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/IronBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -32,7 +32,7 @@
 
 public class IronBlock extends Solid {
 	public IronBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/ironblock/ironblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/ironblock/ironblock.spm");
 		this.setHardness(5.0F).setResistance(10.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.STONE);
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/IronOre.java b/src/main/java/org/spout/vanilla/material/block/ore/IronOre.java
index b38a1861a..aacd95c5c 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/IronOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/IronOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -37,7 +37,7 @@
 
 public class IronOre extends Ore implements TimedCraftable {
 	public IronOre(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/ironore/ironore.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/ironore/ironore.spm");
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.STONE);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliBlock.java b/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliBlock.java
index e045fa24d..8ed33e526 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -32,7 +32,7 @@
 
 public class LapisLazuliBlock extends Solid {
 	public LapisLazuliBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/lapislazuliblock/lapislazuliblock.spm");
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.STONE);
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliOre.java b/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliOre.java
index 67a2b42de..8b0f6c2fc 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/LapisLazuliOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -39,7 +39,7 @@
 
 public class LapisLazuliOre extends Ore implements TimedCraftable, InitializableMaterial {
 	public LapisLazuliOre(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/lapislazuliore/lapislazuliore.spm");
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.STONE);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/MelonBlock.java b/src/main/java/org/spout/vanilla/material/block/ore/MelonBlock.java
index ba26c0a9e..52c66d84f 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/MelonBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/MelonBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -32,7 +32,7 @@
 
 public class MelonBlock extends Ore implements InitializableMaterial {
 	public MelonBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/melon/melon.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/melon/melon.spm");
 		this.setHardness(1.0F).setResistance(1.7F);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/ore/RedstoneOre.java b/src/main/java/org/spout/vanilla/material/block/ore/RedstoneOre.java
index 694c4d883..10634fbd4 100644
--- a/src/main/java/org/spout/vanilla/material/block/ore/RedstoneOre.java
+++ b/src/main/java/org/spout/vanilla/material/block/ore/RedstoneOre.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.ore;
 
@@ -40,7 +40,7 @@ public class RedstoneOre extends Ore implements TimedCraftable, InitializableMat
 	private final boolean glowing;
 
 	public RedstoneOre(String name, int id, boolean glowing) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/redstoneore/redstoneore.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/redstoneore/redstoneore.spm");
 		this.glowing = glowing;
 		this.setHardness(3.0F).setResistance(5.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.STONE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/piston/PistonBlock.java b/src/main/java/org/spout/vanilla/material/block/piston/PistonBlock.java
index 92634841d..b1a55f7a6 100644
--- a/src/main/java/org/spout/vanilla/material/block/piston/PistonBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/piston/PistonBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.piston;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/piston/PistonExtension.java b/src/main/java/org/spout/vanilla/material/block/piston/PistonExtension.java
index 9f590290b..04b5520eb 100644
--- a/src/main/java/org/spout/vanilla/material/block/piston/PistonExtension.java
+++ b/src/main/java/org/spout/vanilla/material/block/piston/PistonExtension.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.piston;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Cactus.java b/src/main/java/org/spout/vanilla/material/block/plant/Cactus.java
index b0d8101b6..0dc91d3ee 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Cactus.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Cactus.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
@@ -47,7 +47,7 @@ public class Cactus extends StackGrowingBase implements TimedCraftable {
 	private Set<BlockMaterial> deniedNeighbours = new HashSet<BlockMaterial>();
 
 	public Cactus(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/nonsolid/cactus/cactus.spm");
+		super(name, id, "model://Vanilla/materials/block/nonsolid/cactus/cactus.spm");
 		this.setHardness(0.4F).setResistance(0.7F).setTransparent();
 		this.addDeniedNeighbour(VanillaMaterials.WEB, VanillaMaterials.STONE_PRESSURE_PLATE, VanillaMaterials.WOODEN_PRESSURE_PLATE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Carrots.java b/src/main/java/org/spout/vanilla/material/block/plant/Carrots.java
index 6d3049649..809ef1e12 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Carrots.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Carrots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/CocoaPlant.java b/src/main/java/org/spout/vanilla/material/block/plant/CocoaPlant.java
index 8e8f78e3a..9169d41d8 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/CocoaPlant.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/CocoaPlant.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/DeadBush.java b/src/main/java/org/spout/vanilla/material/block/plant/DeadBush.java
index 40d266106..0cb7b76e0 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/DeadBush.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/DeadBush.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
@@ -38,19 +38,19 @@
 
 public class DeadBush extends GroundAttachable implements Plant {
 	public DeadBush(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/nonsolid/deadgrass/deadgrass.spm");
+		super(name, id, "model://Vanilla/materials/block/nonsolid/deadgrass/deadgrass.spm");
 		this.setLiquidObstacle(false);
 		this.setHardness(0.0F).setResistance(0.0F).setTransparent();
 	}
 
 	public DeadBush(short dataMask, String name, int id) {
-		super(dataMask, name, id, "model://Vanilla/resources/materials/block/nonsolid/deadgrass/deadgrass.spm");
+		super(dataMask, name, id, "model://Vanilla/materials/block/nonsolid/deadgrass/deadgrass.spm");
 		this.setLiquidObstacle(false);
 		this.setHardness(0.0F).setResistance(0.0F).setTransparent();
 	}
 
 	public DeadBush(String name, int id, int data, VanillaBlockMaterial parent) {
-		super(name, id, data, parent, "model://Vanilla/resources/materials/block/nonsolid/deadgrass/deadgrass.spm");
+		super(name, id, data, parent, "model://Vanilla/materials/block/nonsolid/deadgrass/deadgrass.spm");
 		this.setLiquidObstacle(false);
 		this.setHardness(0.0F).setResistance(0.0F).setTransparent();
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Flower.java b/src/main/java/org/spout/vanilla/material/block/plant/Flower.java
index 1bc115f74..6d9be84a5 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Flower.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Flower.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/LilyPad.java b/src/main/java/org/spout/vanilla/material/block/plant/LilyPad.java
index 4bebd5ac1..1ff611e9c 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/LilyPad.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/LilyPad.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/MelonStem.java b/src/main/java/org/spout/vanilla/material/block/plant/MelonStem.java
index 5dd121d58..80d0b5eab 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/MelonStem.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/MelonStem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Mushroom.java b/src/main/java/org/spout/vanilla/material/block/plant/Mushroom.java
index d827ce04a..0e9152275 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Mushroom.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Mushroom.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/NetherWartBlock.java b/src/main/java/org/spout/vanilla/material/block/plant/NetherWartBlock.java
index 2cac3d128..93d9e1cdc 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/NetherWartBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/NetherWartBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Potatoes.java b/src/main/java/org/spout/vanilla/material/block/plant/Potatoes.java
index c67a0f780..fdcce41a7 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Potatoes.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Potatoes.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/PumpkinStem.java b/src/main/java/org/spout/vanilla/material/block/plant/PumpkinStem.java
index d1d5f513e..ba8ea10f8 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/PumpkinStem.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/PumpkinStem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Sapling.java b/src/main/java/org/spout/vanilla/material/block/plant/Sapling.java
index 43aab99d6..5dd2748f9 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Sapling.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Sapling.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/StackGrowingBase.java b/src/main/java/org/spout/vanilla/material/block/plant/StackGrowingBase.java
index 79091ad7c..2d0c15141 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/StackGrowingBase.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/StackGrowingBase.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Stem.java b/src/main/java/org/spout/vanilla/material/block/plant/Stem.java
index 6fff916a4..be277298c 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Stem.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Stem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/SugarCaneBlock.java b/src/main/java/org/spout/vanilla/material/block/plant/SugarCaneBlock.java
index 3a8ac883f..f64f1cec4 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/SugarCaneBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/SugarCaneBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
@@ -43,7 +43,7 @@ public class SugarCaneBlock extends StackGrowingBase implements InitializableMat
 	private final Set<Material> allowedBases = new HashSet<Material>(4);
 
 	public SugarCaneBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/nonsolid/sugarcane/sugarcane.spm");
+		super(name, id, "model://Vanilla/materials/block/nonsolid/sugarcane/sugarcane.spm");
 		this.setHardness(0.0F).setResistance(0.0F).setTransparent();
 		this.addAllowedBase(VanillaMaterials.DIRT, VanillaMaterials.GRASS, VanillaMaterials.SAND);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/TallGrass.java b/src/main/java/org/spout/vanilla/material/block/plant/TallGrass.java
index f3ee36ae9..b7e6b6b82 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/TallGrass.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/TallGrass.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
@@ -41,9 +41,9 @@
 import org.spout.vanilla.render.VanillaEffects;
 
 public class TallGrass extends DeadBush implements Burnable, InitializableMaterial {
-	public static final TallGrass DEAD_GRASS = new TallGrass("Dead Grass", "model://Vanilla/resources/materials/block/nonsolid/deadgrass/deadgrass.spm");
-	public static final TallGrass TALL_GRASS = new TallGrass("Tall Grass", 1, DEAD_GRASS, "model://Vanilla/resources/materials/block/nonsolid/tallgrass/tallgrass.spm");
-	public static final TallGrass FERN = new TallGrass("Fern", 2, DEAD_GRASS, "model://Vanilla/resources/materials/block/nonsolid/fern/fern.spm");
+	public static final TallGrass DEAD_GRASS = new TallGrass("Dead Grass", "model://Vanilla/materials/block/nonsolid/deadgrass/deadgrass.spm");
+	public static final TallGrass TALL_GRASS = new TallGrass("Tall Grass", 1, DEAD_GRASS, "model://Vanilla/materials/block/nonsolid/tallgrass/tallgrass.spm");
+	public static final TallGrass FERN = new TallGrass("Fern", 2, DEAD_GRASS, "model://Vanilla/materials/block/nonsolid/fern/fern.spm");
 
 	private TallGrass(String name, String model) {
 		super(name, (short) 0x0003, model);
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/Vines.java b/src/main/java/org/spout/vanilla/material/block/plant/Vines.java
index f18b89310..5dd010529 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/Vines.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/Vines.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
@@ -59,7 +59,7 @@ public class Vines extends VanillaBlockMaterial implements Spreading, Plant, Bur
 	private static final int MAX_PER_GROUP = 5;
 
 	public Vines(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/nonsolid/vines/vines.spm");
+		super(name, id, "model://Vanilla/materials/block/nonsolid/vines/vines.spm");
 		this.setLiquidObstacle(false);
 		this.setHardness(0.2F).setResistance(0.3F).setTransparent();
 		this.getDrops().DEFAULT.clear().add(this).addFlags(ToolTypeFlags.SHEARS);
diff --git a/src/main/java/org/spout/vanilla/material/block/plant/WheatCrop.java b/src/main/java/org/spout/vanilla/material/block/plant/WheatCrop.java
index e23e361c1..a35d31889 100644
--- a/src/main/java/org/spout/vanilla/material/block/plant/WheatCrop.java
+++ b/src/main/java/org/spout/vanilla/material/block/plant/WheatCrop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.plant;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/portal/EndPortal.java b/src/main/java/org/spout/vanilla/material/block/portal/EndPortal.java
index fbec2f4fd..a9e862f0d 100644
--- a/src/main/java/org/spout/vanilla/material/block/portal/EndPortal.java
+++ b/src/main/java/org/spout/vanilla/material/block/portal/EndPortal.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.portal;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/portal/NetherPortal.java b/src/main/java/org/spout/vanilla/material/block/portal/NetherPortal.java
index f9c71306b..30f72bb9f 100644
--- a/src/main/java/org/spout/vanilla/material/block/portal/NetherPortal.java
+++ b/src/main/java/org/spout/vanilla/material/block/portal/NetherPortal.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.portal;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/pressureplate/StonePressurePlate.java b/src/main/java/org/spout/vanilla/material/block/pressureplate/StonePressurePlate.java
index 5a9410fb7..d56207faf 100644
--- a/src/main/java/org/spout/vanilla/material/block/pressureplate/StonePressurePlate.java
+++ b/src/main/java/org/spout/vanilla/material/block/pressureplate/StonePressurePlate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.pressureplate;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/pressureplate/WoodenPressurePlate.java b/src/main/java/org/spout/vanilla/material/block/pressureplate/WoodenPressurePlate.java
index 31c616c1a..6765e4c20 100644
--- a/src/main/java/org/spout/vanilla/material/block/pressureplate/WoodenPressurePlate.java
+++ b/src/main/java/org/spout/vanilla/material/block/pressureplate/WoodenPressurePlate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.pressureplate;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/rail/DetectorRail.java b/src/main/java/org/spout/vanilla/material/block/rail/DetectorRail.java
index 47ff8adf1..5387116bf 100644
--- a/src/main/java/org/spout/vanilla/material/block/rail/DetectorRail.java
+++ b/src/main/java/org/spout/vanilla/material/block/rail/DetectorRail.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.rail;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/rail/PoweredRail.java b/src/main/java/org/spout/vanilla/material/block/rail/PoweredRail.java
index 2feebc418..b78a271e5 100644
--- a/src/main/java/org/spout/vanilla/material/block/rail/PoweredRail.java
+++ b/src/main/java/org/spout/vanilla/material/block/rail/PoweredRail.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.rail;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/rail/Rail.java b/src/main/java/org/spout/vanilla/material/block/rail/Rail.java
index e53f485da..1bd3a5232 100644
--- a/src/main/java/org/spout/vanilla/material/block/rail/Rail.java
+++ b/src/main/java/org/spout/vanilla/material/block/rail/Rail.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.rail;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/rail/RailBase.java b/src/main/java/org/spout/vanilla/material/block/rail/RailBase.java
index 7835ddbfe..d5c906c6b 100644
--- a/src/main/java/org/spout/vanilla/material/block/rail/RailBase.java
+++ b/src/main/java/org/spout/vanilla/material/block/rail/RailBase.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.rail;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneRepeater.java b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneRepeater.java
index 4fd91ce63..a743f72c4 100644
--- a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneRepeater.java
+++ b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneRepeater.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.redstone;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneSource.java b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneSource.java
index d1901ed03..ef2898846 100644
--- a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneSource.java
+++ b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneSource.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.redstone;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTarget.java b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTarget.java
index b1c09b9b6..3b1112b54 100644
--- a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTarget.java
+++ b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTarget.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.redstone;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTorch.java b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTorch.java
index 281709a04..1668c96dc 100644
--- a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTorch.java
+++ b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneTorch.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.redstone;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneWire.java b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneWire.java
index fe5ebfb98..324c093de 100644
--- a/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneWire.java
+++ b/src/main/java/org/spout/vanilla/material/block/redstone/RedstoneWire.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.redstone;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Bedrock.java b/src/main/java/org/spout/vanilla/material/block/solid/Bedrock.java
index 32382aa7d..bc3b595e3 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Bedrock.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Bedrock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -34,7 +34,7 @@
 
 public class Bedrock extends Solid {
 	public Bedrock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/bedrock/bedrock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/bedrock/bedrock.spm");
 		this.setResistance(6000000.0F).setHardness(-1.0F);
 		getDrops().DEFAULT.clear();
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/BookShelf.java b/src/main/java/org/spout/vanilla/material/block/solid/BookShelf.java
index 2fb85d8b2..84f322f9d 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/BookShelf.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/BookShelf.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -42,7 +42,7 @@ public class BookShelf extends Solid implements Fuel, InitializableMaterial, Bur
 	public final float BURN_TIME = 15;
 
 	public BookShelf(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/bookshelf/bookshelf.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/bookshelf/bookshelf.spm");
 		this.setHardness(1.5F).setResistance(2.5F).addMiningType(ToolType.AXE).setMiningLevel(ToolLevel.WOOD);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Brick.java b/src/main/java/org/spout/vanilla/material/block/solid/Brick.java
index 9fa73a810..71ab5853e 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Brick.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Brick.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -32,7 +32,7 @@
 
 public class Brick extends Solid {
 	public Brick(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/bricks/bricks.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/bricks/bricks.spm");
 		this.setHardness(2.0F).setResistance(10.0F);
 		getDrops().NOT_CREATIVE.addFlags(ToolTypeFlags.PICKAXE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/CauldronBlock.java b/src/main/java/org/spout/vanilla/material/block/solid/CauldronBlock.java
index 3f1a4c68b..9251a54b5 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/CauldronBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/CauldronBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/ClayBlock.java b/src/main/java/org/spout/vanilla/material/block/solid/ClayBlock.java
index 3ae439412..1bef99d14 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/ClayBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/ClayBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -34,7 +34,7 @@
 
 public class ClayBlock extends Solid implements InitializableMaterial {
 	public ClayBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/clayblock/clayblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/clayblock/clayblock.spm");
 		this.setHardness(0.6F).setResistance(1.0F).setStepSound(SoundEffects.STEP_GRAVEL);
 		this.addMiningType(ToolType.SPADE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Cobblestone.java b/src/main/java/org/spout/vanilla/material/block/solid/Cobblestone.java
index d6203b7eb..64d646385 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Cobblestone.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Cobblestone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -38,7 +38,7 @@
 
 public class Cobblestone extends Solid implements TimedCraftable {
 	public Cobblestone(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/cobblestone/cobblestone.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/cobblestone/cobblestone.spm");
 		this.setHardness(2.0F).setResistance(10.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.WOOD);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Dirt.java b/src/main/java/org/spout/vanilla/material/block/solid/Dirt.java
index bcef7869d..39473e89f 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Dirt.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Dirt.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -32,7 +32,7 @@
 
 public class Dirt extends Solid {
 	public Dirt(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/dirt/dirt.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/dirt/dirt.spm");
 		this.setHardness(0.5F).setResistance(0.8F).setStepSound(SoundEffects.STEP_GRAVEL);
 		this.addMiningType(ToolType.SPADE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/DoubleSlab.java b/src/main/java/org/spout/vanilla/material/block/solid/DoubleSlab.java
index 9940b86c0..06b93b29e 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/DoubleSlab.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/DoubleSlab.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -34,16 +34,16 @@
 import org.spout.vanilla.material.block.misc.Slab;
 
 public class DoubleSlab extends Solid implements Burnable {
-	public static final DoubleSlab STONE = new DoubleSlab((short) 0x7, "Stone Double Slab", 43, false, Slab.STONE, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab SANDSTONE = new DoubleSlab("Sandstone Double Slab", 0x1, STONE, Slab.SANDSTONE, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab STONE_WOOD = new DoubleSlab("Wooden Double Slab", 0x2, STONE, Slab.STONE_WOOD, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab COBBLESTONE = new DoubleSlab("Cobblestone Double Slab", 0x3, STONE, Slab.COBBLESTONE, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab BRICK = new DoubleSlab("Brick Double Slab", 0x4, STONE, Slab.BRICK, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab STONE_BRICK = new DoubleSlab("Stone Brick Double Slab", 0x5, STONE, Slab.STONE_BRICK, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab OAK_WOOD = new DoubleSlab((short) 0x3, "Oak Wooden Double Slab", 125, true, Slab.OAK_WOOD, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab SPRUCE_WOOD = new DoubleSlab("Spruce Wooden Double Slab", 0x1, OAK_WOOD, Slab.SPRUCE_WOOD, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab BIRCH_WOOD = new DoubleSlab("Birch Wooden Double Slab", 0x2, OAK_WOOD, Slab.BIRCH_WOOD, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
-	public static final DoubleSlab JUNGLE_WOOD = new DoubleSlab("Jungle Wooden Double Slab", 0x3, OAK_WOOD, Slab.JUNGLE_WOOD, "model://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab STONE = new DoubleSlab((short) 0x7, "Stone Double Slab", 43, false, Slab.STONE, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab SANDSTONE = new DoubleSlab("Sandstone Double Slab", 0x1, STONE, Slab.SANDSTONE, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab STONE_WOOD = new DoubleSlab("Wooden Double Slab", 0x2, STONE, Slab.STONE_WOOD, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab COBBLESTONE = new DoubleSlab("Cobblestone Double Slab", 0x3, STONE, Slab.COBBLESTONE, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab BRICK = new DoubleSlab("Brick Double Slab", 0x4, STONE, Slab.BRICK, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab STONE_BRICK = new DoubleSlab("Stone Brick Double Slab", 0x5, STONE, Slab.STONE_BRICK, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab OAK_WOOD = new DoubleSlab((short) 0x3, "Oak Wooden Double Slab", 125, true, Slab.OAK_WOOD, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab SPRUCE_WOOD = new DoubleSlab("Spruce Wooden Double Slab", 0x1, OAK_WOOD, Slab.SPRUCE_WOOD, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab BIRCH_WOOD = new DoubleSlab("Birch Wooden Double Slab", 0x2, OAK_WOOD, Slab.BIRCH_WOOD, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
+	public static final DoubleSlab JUNGLE_WOOD = new DoubleSlab("Jungle Wooden Double Slab", 0x3, OAK_WOOD, Slab.JUNGLE_WOOD, "model://Vanilla/materials/block/solid/doubleslabs/doubleslabs.spm");
 	private Slab singletype;
 	private final boolean wood;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Endstone.java b/src/main/java/org/spout/vanilla/material/block/solid/Endstone.java
index f36a43abe..862aa0fa2 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Endstone.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Endstone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -33,7 +33,7 @@
 
 public class Endstone extends Solid {
 	public Endstone(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/endstone/endstone.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/endstone/endstone.spm");
 		this.setHardness(3.0F).setResistance(15.0F);
 		getDrops().NOT_CREATIVE.addFlags(ToolTypeFlags.PICKAXE, ToolLevelFlags.WOOD_UP);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Glass.java b/src/main/java/org/spout/vanilla/material/block/solid/Glass.java
index 2ba8cd247..63e787f7a 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Glass.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Glass.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -35,7 +35,7 @@
 
 public class Glass extends Solid {
 	public Glass(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/glass/glass.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/glass/glass.spm");
 		this.setHardness(0.3F).setResistance(0.5F).setTransparent();
 		this.getDrops().DEFAULT.clear();
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Grass.java b/src/main/java/org/spout/vanilla/material/block/solid/Grass.java
index b6a367bbe..e12175599 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Grass.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Grass.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -43,7 +43,7 @@
 
 public class Grass extends SpreadingSolid implements DynamicMaterial, InitializableMaterial {
 	public Grass(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/grass/grass.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/grass/grass.spm");
 		this.setHardness(0.6F).setResistance(0.8F).setStepSound(SoundEffects.STEP_GRASS);
 		this.addMiningType(ToolType.SPADE);
 		if (Spout.getEngine().getPlatform() == Platform.CLIENT) {
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Gravel.java b/src/main/java/org/spout/vanilla/material/block/solid/Gravel.java
index 9d4cd7d24..87a89021f 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Gravel.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Gravel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -36,7 +36,7 @@
 
 public class Gravel extends SolidMoving implements InitializableMaterial {
 	public Gravel(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/gravel/gravel.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/gravel/gravel.spm");
 		this.setHardness(0.6F).setResistance(1.0F).setStepSound(SoundEffects.STEP_GRAVEL);
 		this.addMiningType(ToolType.SPADE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Ice.java b/src/main/java/org/spout/vanilla/material/block/solid/Ice.java
index 90a86b971..4c9ed12bd 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Ice.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Ice.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -47,7 +47,7 @@ public class Ice extends SpreadingSolid implements InitializableMaterial {
 	private static final EffectRange ICE_SPREAD_RANGE = new CubicEffectRange(1);
 
 	public Ice(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/iceblock/iceblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/iceblock/iceblock.spm");
 		this.setHardness(0.5F).setResistance(0.8F).setOcclusion((short) 0, BlockFaces.NONE).setOpacity((byte) 2);
 		this.getDrops().clear();
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/IronBarsBlock.java b/src/main/java/org/spout/vanilla/material/block/solid/IronBarsBlock.java
index e92fc253d..3d2079be9 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/IronBarsBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/IronBarsBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Leaves.java b/src/main/java/org/spout/vanilla/material/block/solid/Leaves.java
index 0815a4a1f..42776bd0d 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Leaves.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Leaves.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -41,10 +41,10 @@
 import org.spout.vanilla.render.VanillaEffects;
 
 public class Leaves extends Solid implements Burnable, InitializableMaterial {
-	public static final Leaves DEFAULT = new Leaves("Leaves", "model://Vanilla/resources/materials/block/solid/oakleaves/oakleaves.spm");
-	public static final Leaves SPRUCE = new Leaves("Spruce Leaves", 1, DEFAULT, "model://Vanilla/resources/materials/block/solid/spruceleaves/spruceleaves.spm");
-	public static final Leaves BIRCH = new Leaves("Birch Leaves", 2, DEFAULT, "model://Vanilla/resources/materials/block/solid/birchleaves/birchleaves.spm");
-	public static final Leaves JUNGLE = new Leaves("Jungle Leaves", 3, DEFAULT, "model://Vanilla/resources/materials/block/solid/jungleleaves/jungleleaves.spm");
+	public static final Leaves DEFAULT = new Leaves("Leaves", "model://Vanilla/materials/block/solid/oakleaves/oakleaves.spm");
+	public static final Leaves SPRUCE = new Leaves("Spruce Leaves", 1, DEFAULT, "model://Vanilla/materials/block/solid/spruceleaves/spruceleaves.spm");
+	public static final Leaves BIRCH = new Leaves("Birch Leaves", 2, DEFAULT, "model://Vanilla/materials/block/solid/birchleaves/birchleaves.spm");
+	public static final Leaves JUNGLE = new Leaves("Jungle Leaves", 3, DEFAULT, "model://Vanilla/materials/block/solid/jungleleaves/jungleleaves.spm");
 
 	private Leaves(String name, String model) {
 		super((short) 0x0003, name, 18, model);
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/LockedChest.java b/src/main/java/org/spout/vanilla/material/block/solid/LockedChest.java
index 9c4a456d1..37df3061c 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/LockedChest.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/LockedChest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Log.java b/src/main/java/org/spout/vanilla/material/block/solid/Log.java
index 191b735d0..9950b89b3 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Log.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Log.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -60,10 +60,10 @@
 import org.spout.vanilla.util.PlayerUtil;
 
 public class Log extends Solid implements DynamicMaterial, Fuel, TimedCraftable, Burnable, Directional {
-	public static final Log DEFAULT = new Log("Wood", Sapling.DEFAULT, "model://Vanilla/resources/materials/block/solid/oakwood/oakwood.spm");
-	public static final Log SPRUCE = new Log("Spruce Wood", 1, DEFAULT, Sapling.SPRUCE, "model://Vanilla/resources/materials/block/solid/sprucewood/sprucewood.spm");
-	public static final Log BIRCH = new Log("Birch Wood", 2, DEFAULT, Sapling.BIRCH, "model://Vanilla/resources/materials/block/solid/birchwood/birchwood.spm");
-	public static final Log JUNGLE = new Log("Jungle Wood", 3, DEFAULT, Sapling.JUNGLE, "model://Vanilla/resources/materials/block/solid/junglewood/junglewood.spm");
+	public static final Log DEFAULT = new Log("Wood", Sapling.DEFAULT, "model://Vanilla/materials/block/solid/oakwood/oakwood.spm");
+	public static final Log SPRUCE = new Log("Spruce Wood", 1, DEFAULT, Sapling.SPRUCE, "model://Vanilla/materials/block/solid/sprucewood/sprucewood.spm");
+	public static final Log BIRCH = new Log("Birch Wood", 2, DEFAULT, Sapling.BIRCH, "model://Vanilla/materials/block/solid/birchwood/birchwood.spm");
+	public static final Log JUNGLE = new Log("Jungle Wood", 3, DEFAULT, Sapling.JUNGLE, "model://Vanilla/materials/block/solid/junglewood/junglewood.spm");
 	private static final BlockFaces DIRECTION_OPPOS = new BlockFaces(BlockFace.BOTTOM, BlockFace.NORTH, BlockFace.EAST);
 	private static final BlockFaces DIRECTION_FACES = new BlockFaces(BlockFace.TOP, BlockFace.SOUTH, BlockFace.WEST, BlockFace.THIS);
 	private static final short dataMask = 0x0003;
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/MossStone.java b/src/main/java/org/spout/vanilla/material/block/solid/MossStone.java
index 3a038c4e0..853cd4d4f 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/MossStone.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/MossStone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -33,7 +33,7 @@
 
 public class MossStone extends Solid {
 	public MossStone(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/mossycobblestone/mossycobblestone.spm");
 		this.setHardness(2.0F).setResistance(10.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.WOOD);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/MushroomBlock.java b/src/main/java/org/spout/vanilla/material/block/solid/MushroomBlock.java
index 222b2b5ec..a36edd3fd 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/MushroomBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/MushroomBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Mycelium.java b/src/main/java/org/spout/vanilla/material/block/solid/Mycelium.java
index 15c97238e..4b41a2c81 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Mycelium.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Mycelium.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -38,7 +38,7 @@
 
 public class Mycelium extends SpreadingSolid implements InitializableMaterial {
 	public Mycelium(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/mycelium/mycelium.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/mycelium/mycelium.spm");
 		this.setHardness(0.6F).setResistance(0.8F).addMiningType(ToolType.SPADE);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/NetherBrick.java b/src/main/java/org/spout/vanilla/material/block/solid/NetherBrick.java
index 5ac3729d6..e17587786 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/NetherBrick.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/NetherBrick.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -31,7 +31,7 @@
 
 public class NetherBrick extends Solid {
 	public NetherBrick(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/netherbrick/netherbrick.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/netherbrick/netherbrick.spm");
 		this.setHardness(2.0F).setResistance(10.0F);
 		this.getDrops().NOT_CREATIVE.addFlags(ToolTypeFlags.PICKAXE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/NetherRack.java b/src/main/java/org/spout/vanilla/material/block/solid/NetherRack.java
index 1bebffff1..18c933766 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/NetherRack.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/NetherRack.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -31,7 +31,7 @@
 
 public class NetherRack extends Solid {
 	public NetherRack(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/netherrack/netherrack.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/netherrack/netherrack.spm");
 		this.setHardness(0.6F).setResistance(0.6F);
 		this.getDrops().NOT_CREATIVE.addFlags(ToolTypeFlags.PICKAXE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Obsidian.java b/src/main/java/org/spout/vanilla/material/block/solid/Obsidian.java
index f9a21a14c..5ae38b157 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Obsidian.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Obsidian.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -35,7 +35,7 @@
 
 public class Obsidian extends Solid {
 	public Obsidian(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/obsidian/obsidian.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/obsidian/obsidian.spm");
 		this.setHardness(50.0F).setResistance(2000.0F);
 		this.getDrops().NOT_CREATIVE.addFlags(ToolTypeFlags.PICKAXE, ToolLevelFlags.DIAMOND_UP);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Plank.java b/src/main/java/org/spout/vanilla/material/block/solid/Plank.java
index fd6fcdfa6..4e4addb07 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Plank.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Plank.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -39,10 +39,10 @@
 import org.spout.vanilla.material.block.Solid;
 
 public class Plank extends Solid implements Fuel, Burnable {
-	public static final Plank PLANK = new Plank("Oak Plank", "model://Vanilla/resources/materials/block/solid/oakplanks/oakplanks.spm");
-	public static final Plank PINE = new Plank("Pine Plank", WoodType.PINE, PLANK, "model://Vanilla/resources/materials/block/solid/spruceplanks/spruceplanks.spm");
-	public static final Plank BIRCH = new Plank("Birch Plank", WoodType.BIRCH, PLANK, "model://Vanilla/resources/materials/block/solid/birchplanks/birchplanks.spm");
-	public static final Plank JUNGLE = new Plank("Jungle Plank", WoodType.JUNGLE, PLANK, "model://Vanilla/resources/materials/block/solid/jungleplanks/jungleplanks.spm");
+	public static final Plank PLANK = new Plank("Oak Plank", "model://Vanilla/materials/block/solid/oakplanks/oakplanks.spm");
+	public static final Plank PINE = new Plank("Pine Plank", WoodType.PINE, PLANK, "model://Vanilla/materials/block/solid/spruceplanks/spruceplanks.spm");
+	public static final Plank BIRCH = new Plank("Birch Plank", WoodType.BIRCH, PLANK, "model://Vanilla/materials/block/solid/birchplanks/birchplanks.spm");
+	public static final Plank JUNGLE = new Plank("Jungle Plank", WoodType.JUNGLE, PLANK, "model://Vanilla/materials/block/solid/jungleplanks/jungleplanks.spm");
 	private final WoodType type;
 	public final float BURN_TIME = 15;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Pumpkin.java b/src/main/java/org/spout/vanilla/material/block/solid/Pumpkin.java
index 94996f1e7..6d089dd9a 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Pumpkin.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Pumpkin.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -41,7 +41,7 @@ public class Pumpkin extends Solid implements Directional {
 	private final boolean lantern;
 
 	public Pumpkin(String name, int id, boolean lantern) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/pumpkin/pumpkin.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/pumpkin/pumpkin.spm");
 		this.lantern = lantern;
 		this.setHardness(1.0F).setResistance(1.7F).addMiningType(ToolType.AXE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/RedstoneLamp.java b/src/main/java/org/spout/vanilla/material/block/solid/RedstoneLamp.java
index 4ab616ee6..7a6e63280 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/RedstoneLamp.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/RedstoneLamp.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Sand.java b/src/main/java/org/spout/vanilla/material/block/solid/Sand.java
index 5d4729489..868a35338 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Sand.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Sand.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -38,7 +38,7 @@
 
 public class Sand extends SolidMoving implements TimedCraftable {
 	public Sand(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/sand/sand.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/sand/sand.spm");
 		this.setHardness(0.5F).setResistance(0.8F).setStepSound(SoundEffects.STEP_SAND);
 		this.addMiningType(ToolType.SPADE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Sandstone.java b/src/main/java/org/spout/vanilla/material/block/solid/Sandstone.java
index b6b6906d6..bd4c56764 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Sandstone.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Sandstone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -33,9 +33,9 @@
 import org.spout.vanilla.material.block.Solid;
 
 public class Sandstone extends Solid {
-	public static final Sandstone SANDSTONE = new Sandstone("Sandstone", "model://Vanilla/resources/materials/block/solid/sandstone/sandstone.spm");
-	public static final Sandstone DECORATIVE = new Sandstone("Decorative Sandstone", SandstoneType.DECORATIVE, SANDSTONE, "model://Vanilla/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm");
-	public static final Sandstone SMOOTH = new Sandstone("Smooth Sandstone", SandstoneType.SMOOTH, SANDSTONE, "model://Vanilla/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm");
+	public static final Sandstone SANDSTONE = new Sandstone("Sandstone", "model://Vanilla/materials/block/solid/sandstone/sandstone.spm");
+	public static final Sandstone DECORATIVE = new Sandstone("Decorative Sandstone", SandstoneType.DECORATIVE, SANDSTONE, "model://Vanilla/materials/block/solid/cheseledsandstone/cheseledsandstone.spm");
+	public static final Sandstone SMOOTH = new Sandstone("Smooth Sandstone", SandstoneType.SMOOTH, SANDSTONE, "model://Vanilla/materials/block/solid/smoothsandstone/smoothsandstone.spm");
 	private final SandstoneType type;
 
 	private Sandstone(String name, String model) {
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/SilverfishStone.java b/src/main/java/org/spout/vanilla/material/block/solid/SilverfishStone.java
index 034cedaf8..d2fd09bf9 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/SilverfishStone.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/SilverfishStone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/SnowBlock.java b/src/main/java/org/spout/vanilla/material/block/solid/SnowBlock.java
index 9f3cea1fe..dd6f69144 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/SnowBlock.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/SnowBlock.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -36,7 +36,7 @@
 
 public class SnowBlock extends Solid implements InitializableMaterial {
 	public SnowBlock(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/snowblock/snowblock.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/snowblock/snowblock.spm");
 		this.setHardness(0.2F).setResistance(0.3F).setStepSound(SoundEffects.STEP_CLOTH);
 		this.addMiningType(ToolType.SPADE).setMiningLevel(ToolLevel.WOOD);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/SoulSand.java b/src/main/java/org/spout/vanilla/material/block/solid/SoulSand.java
index 0e577813b..737748241 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/SoulSand.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/SoulSand.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -33,7 +33,7 @@
 
 public class SoulSand extends Solid {
 	public SoulSand(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/soulsand/soulsand.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/soulsand/soulsand.spm");
 		this.setHardness(0.5F).setResistance(0.8F).setStepSound(SoundEffects.STEP_SAND);
 		this.addMiningType(ToolType.SPADE);
 	}
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Sponge.java b/src/main/java/org/spout/vanilla/material/block/solid/Sponge.java
index 49e645f56..bea5d9814 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Sponge.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Sponge.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -30,6 +30,6 @@
 
 public class Sponge extends Solid {
 	public Sponge(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/sponge/sponge.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/sponge/sponge.spm");
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Stone.java b/src/main/java/org/spout/vanilla/material/block/solid/Stone.java
index 42e67490b..baf3b0be1 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Stone.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Stone.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -35,7 +35,7 @@
 
 public class Stone extends Solid implements InitializableMaterial {
 	public Stone(String name, int id) {
-		super(name, id, "model://Vanilla/resources/materials/block/solid/stone/stone.spm");
+		super(name, id, "model://Vanilla/materials/block/solid/stone/stone.spm");
 		this.setHardness(1.5F).setResistance(10.0F).addMiningType(ToolType.PICKAXE).setMiningLevel(ToolLevel.WOOD);
 	}
 
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/StoneBrick.java b/src/main/java/org/spout/vanilla/material/block/solid/StoneBrick.java
index a681acef3..c412e5299 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/StoneBrick.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/StoneBrick.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -31,9 +31,9 @@
 import org.spout.vanilla.material.block.Solid;
 
 public class StoneBrick extends Solid {
-	public static final StoneBrick STONE = new StoneBrick("Stone Brick", "model://Vanilla/resources/materials/block/solid/stonebrick/stonebrick.spm");
-	public static final StoneBrick MOSSY_STONE = new StoneBrick("Mossy Stone Brick", 1, STONE, "model://Vanilla/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm");
-	public static final StoneBrick CRACKED_STONE = new StoneBrick("Cracked Stone Brick", 2, STONE, "model://Vanilla/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm");
+	public static final StoneBrick STONE = new StoneBrick("Stone Brick", "model://Vanilla/materials/block/solid/stonebrick/stonebrick.spm");
+	public static final StoneBrick MOSSY_STONE = new StoneBrick("Mossy Stone Brick", 1, STONE, "model://Vanilla/materials/block/solid/mossystonebrick/mossystonebrick.spm");
+	public static final StoneBrick CRACKED_STONE = new StoneBrick("Cracked Stone Brick", 2, STONE, "model://Vanilla/materials/block/solid/crackedstonebrick/crackedstonebrick.spm");
 
 	private StoneBrick(String name, String model) {
 		super((short) 0x0003, name, 98, model);
diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Wool.java b/src/main/java/org/spout/vanilla/material/block/solid/Wool.java
index 19efd1717..9fa944ff7 100644
--- a/src/main/java/org/spout/vanilla/material/block/solid/Wool.java
+++ b/src/main/java/org/spout/vanilla/material/block/solid/Wool.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.solid;
 
@@ -39,22 +39,22 @@
 import org.spout.vanilla.material.block.Solid;
 
 public class Wool extends Solid implements Burnable {
-	public static final Wool WHITE_WOOL = new Wool("White Wool", "model://Vanilla/resources/materials/block/solid/whitewool/whitewool.spm");
-	public static final Wool ORANGE_WOOL = new Wool("Orange Wool", WoolColor.ORANGE, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/orangewool/orangewool.spm");
-	public static final Wool MAGENTA_WOOL = new Wool("Magenta Wool", WoolColor.MAGENTA, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/magentawool/magentawool.spm");
-	public static final Wool LIGHTBLUE_WOOL = new Wool("Light Blue Wool", WoolColor.LIGHTBLUE, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/lightbluewool/lightbluewool.spm");
-	public static final Wool YELLOW_WOOL = new Wool("Yellow Wool", WoolColor.YELLOW, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/yellowwool/yellowwool.spm");
-	public static final Wool LIME_WOOL = new Wool("Lime Wool", WoolColor.LIME, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/whitewool/whitewool.spm"); // TODO : add the lime wool
-	public static final Wool PINK_WOOL = new Wool("Pink Wool", WoolColor.PINK, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/pinkwool/pinkwool.spm");
-	public static final Wool GRAY_WOOL = new Wool("Gray Wool", WoolColor.GRAY, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/graywool/graywool.spm");
-	public static final Wool SILVER_WOOL = new Wool("Light Gray Wool", WoolColor.SILVER, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/lightgraywool/lightgraywool.spm");
-	public static final Wool CYAN_WOOL = new Wool("Cyan Wool", WoolColor.CYAN, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/cyanwool/cyanwool.spm");
-	public static final Wool PURPLE_WOOL = new Wool("Purple Wool", WoolColor.PURPLE, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/purplewool/purplewool.spm");
-	public static final Wool BLUE_WOOL = new Wool("Blue Wool", WoolColor.BLUE, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/bluewool/bluewool.spm");
-	public static final Wool BROWN_WOOL = new Wool("Brown Wool", WoolColor.BROWN, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/brownwool/brownwool.spm");
-	public static final Wool GREEN_WOOL = new Wool("Green Wool", WoolColor.GREEN, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/greenwool/greenwool.spm");
-	public static final Wool RED_WOOL = new Wool("Red Wool", WoolColor.RED, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/redwool/redwool.spm");
-	public static final Wool BLACK_WOOL = new Wool("Black Wool", WoolColor.BLACK, WHITE_WOOL, "model://Vanilla/resources/materials/block/solid/blackwool/blackwool.spm");
+	public static final Wool WHITE_WOOL = new Wool("White Wool", "model://Vanilla/materials/block/solid/whitewool/whitewool.spm");
+	public static final Wool ORANGE_WOOL = new Wool("Orange Wool", WoolColor.ORANGE, WHITE_WOOL, "model://Vanilla/materials/block/solid/orangewool/orangewool.spm");
+	public static final Wool MAGENTA_WOOL = new Wool("Magenta Wool", WoolColor.MAGENTA, WHITE_WOOL, "model://Vanilla/materials/block/solid/magentawool/magentawool.spm");
+	public static final Wool LIGHTBLUE_WOOL = new Wool("Light Blue Wool", WoolColor.LIGHTBLUE, WHITE_WOOL, "model://Vanilla/materials/block/solid/lightbluewool/lightbluewool.spm");
+	public static final Wool YELLOW_WOOL = new Wool("Yellow Wool", WoolColor.YELLOW, WHITE_WOOL, "model://Vanilla/materials/block/solid/yellowwool/yellowwool.spm");
+	public static final Wool LIME_WOOL = new Wool("Lime Wool", WoolColor.LIME, WHITE_WOOL, "model://Vanilla/materials/block/solid/whitewool/whitewool.spm"); // TODO : add the lime wool
+	public static final Wool PINK_WOOL = new Wool("Pink Wool", WoolColor.PINK, WHITE_WOOL, "model://Vanilla/materials/block/solid/pinkwool/pinkwool.spm");
+	public static final Wool GRAY_WOOL = new Wool("Gray Wool", WoolColor.GRAY, WHITE_WOOL, "model://Vanilla/materials/block/solid/graywool/graywool.spm");
+	public static final Wool SILVER_WOOL = new Wool("Light Gray Wool", WoolColor.SILVER, WHITE_WOOL, "model://Vanilla/materials/block/solid/lightgraywool/lightgraywool.spm");
+	public static final Wool CYAN_WOOL = new Wool("Cyan Wool", WoolColor.CYAN, WHITE_WOOL, "model://Vanilla/materials/block/solid/cyanwool/cyanwool.spm");
+	public static final Wool PURPLE_WOOL = new Wool("Purple Wool", WoolColor.PURPLE, WHITE_WOOL, "model://Vanilla/materials/block/solid/purplewool/purplewool.spm");
+	public static final Wool BLUE_WOOL = new Wool("Blue Wool", WoolColor.BLUE, WHITE_WOOL, "model://Vanilla/materials/block/solid/bluewool/bluewool.spm");
+	public static final Wool BROWN_WOOL = new Wool("Brown Wool", WoolColor.BROWN, WHITE_WOOL, "model://Vanilla/materials/block/solid/brownwool/brownwool.spm");
+	public static final Wool GREEN_WOOL = new Wool("Green Wool", WoolColor.GREEN, WHITE_WOOL, "model://Vanilla/materials/block/solid/greenwool/greenwool.spm");
+	public static final Wool RED_WOOL = new Wool("Red Wool", WoolColor.RED, WHITE_WOOL, "model://Vanilla/materials/block/solid/redwool/redwool.spm");
+	public static final Wool BLACK_WOOL = new Wool("Black Wool", WoolColor.BLACK, WHITE_WOOL, "model://Vanilla/materials/block/solid/blackwool/blackwool.spm");
 	private final WoolColor color;
 
 	private Wool(String name, String model) {
diff --git a/src/main/java/org/spout/vanilla/material/block/stair/BrickStairs.java b/src/main/java/org/spout/vanilla/material/block/stair/BrickStairs.java
index 86cd73225..208b51991 100644
--- a/src/main/java/org/spout/vanilla/material/block/stair/BrickStairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/stair/BrickStairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.stair;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/stair/CobblestoneStairs.java b/src/main/java/org/spout/vanilla/material/block/stair/CobblestoneStairs.java
index de2384a7a..b0139116c 100644
--- a/src/main/java/org/spout/vanilla/material/block/stair/CobblestoneStairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/stair/CobblestoneStairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.stair;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/stair/NetherBrickStairs.java b/src/main/java/org/spout/vanilla/material/block/stair/NetherBrickStairs.java
index 8cfc923b3..a1243f29b 100644
--- a/src/main/java/org/spout/vanilla/material/block/stair/NetherBrickStairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/stair/NetherBrickStairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.stair;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/stair/SandstoneStairs.java b/src/main/java/org/spout/vanilla/material/block/stair/SandstoneStairs.java
index 9dc1298c7..a80d05d72 100644
--- a/src/main/java/org/spout/vanilla/material/block/stair/SandstoneStairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/stair/SandstoneStairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.stair;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/stair/StoneBrickStairs.java b/src/main/java/org/spout/vanilla/material/block/stair/StoneBrickStairs.java
index a838f44a2..aba19917f 100644
--- a/src/main/java/org/spout/vanilla/material/block/stair/StoneBrickStairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/stair/StoneBrickStairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.stair;
 
diff --git a/src/main/java/org/spout/vanilla/material/block/stair/WoodenStairs.java b/src/main/java/org/spout/vanilla/material/block/stair/WoodenStairs.java
index 7b5ff8514..991c8a608 100644
--- a/src/main/java/org/spout/vanilla/material/block/stair/WoodenStairs.java
+++ b/src/main/java/org/spout/vanilla/material/block/stair/WoodenStairs.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.block.stair;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/ArmorEnchantment.java b/src/main/java/org/spout/vanilla/material/enchantment/ArmorEnchantment.java
index 74bfb9142..bba55ec64 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/ArmorEnchantment.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/ArmorEnchantment.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/BowEnchantment.java b/src/main/java/org/spout/vanilla/material/enchantment/BowEnchantment.java
index 81c98b2cd..bcd3d8f0d 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/BowEnchantment.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/BowEnchantment.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/Enchantment.java b/src/main/java/org/spout/vanilla/material/enchantment/Enchantment.java
index 567ff5755..a71801cdb 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/Enchantment.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/Enchantment.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/Enchantments.java b/src/main/java/org/spout/vanilla/material/enchantment/Enchantments.java
index 3729d1688..c6bbfbeda 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/Enchantments.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/Enchantments.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/SwordEnchantment.java b/src/main/java/org/spout/vanilla/material/enchantment/SwordEnchantment.java
index 3c843236b..b2ba66d8f 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/SwordEnchantment.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/SwordEnchantment.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/ToolEnchantment.java b/src/main/java/org/spout/vanilla/material/enchantment/ToolEnchantment.java
index f61129206..99c6602f2 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/ToolEnchantment.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/ToolEnchantment.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/AquaAffinity.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/AquaAffinity.java
index 68071d062..bc2058869 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/AquaAffinity.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/AquaAffinity.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/BlastProtection.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/BlastProtection.java
index 2f546f233..9331ac1d8 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/BlastProtection.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/BlastProtection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/FeatherFalling.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/FeatherFalling.java
index 81cd15f98..5d90d7680 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/FeatherFalling.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/FeatherFalling.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/FireProtection.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/FireProtection.java
index c0c348e36..73d6bf250 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/FireProtection.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/FireProtection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/ProjectileProtection.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/ProjectileProtection.java
index 261cc1c1b..6ca627a01 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/ProjectileProtection.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/ProjectileProtection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/Protection.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/Protection.java
index b9831158a..5386a0c07 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/Protection.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/Protection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/armor/Respiration.java b/src/main/java/org/spout/vanilla/material/enchantment/armor/Respiration.java
index 10c8da6ec..afcde8b6f 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/armor/Respiration.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/armor/Respiration.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/bow/Flame.java b/src/main/java/org/spout/vanilla/material/enchantment/bow/Flame.java
index 92f95d6ef..6ea179b22 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/bow/Flame.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/bow/Flame.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.bow;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/bow/Infinity.java b/src/main/java/org/spout/vanilla/material/enchantment/bow/Infinity.java
index dfa89c2bc..c99cb6c75 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/bow/Infinity.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/bow/Infinity.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.bow;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/bow/Power.java b/src/main/java/org/spout/vanilla/material/enchantment/bow/Power.java
index 6420fd6d7..83e79b6c1 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/bow/Power.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/bow/Power.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.bow;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/bow/Punch.java b/src/main/java/org/spout/vanilla/material/enchantment/bow/Punch.java
index e784dea0a..13050256d 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/bow/Punch.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/bow/Punch.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.bow;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/sword/BaneOfArthropods.java b/src/main/java/org/spout/vanilla/material/enchantment/sword/BaneOfArthropods.java
index 0e08b3e6c..dca30b3de 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/sword/BaneOfArthropods.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/sword/BaneOfArthropods.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.sword;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/sword/FireAspect.java b/src/main/java/org/spout/vanilla/material/enchantment/sword/FireAspect.java
index 28ccfdb1f..5fd3a2f58 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/sword/FireAspect.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/sword/FireAspect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.sword;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/sword/Knockback.java b/src/main/java/org/spout/vanilla/material/enchantment/sword/Knockback.java
index 08c9914f9..ca48863c7 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/sword/Knockback.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/sword/Knockback.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.sword;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/sword/Looting.java b/src/main/java/org/spout/vanilla/material/enchantment/sword/Looting.java
index f7adf4293..8239a152f 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/sword/Looting.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/sword/Looting.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.sword;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/sword/Sharpness.java b/src/main/java/org/spout/vanilla/material/enchantment/sword/Sharpness.java
index ab80218ac..61a05e0db 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/sword/Sharpness.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/sword/Sharpness.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.sword;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/sword/Smite.java b/src/main/java/org/spout/vanilla/material/enchantment/sword/Smite.java
index ee12b9bbd..c54801a6c 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/sword/Smite.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/sword/Smite.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.sword;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/tool/Efficiency.java b/src/main/java/org/spout/vanilla/material/enchantment/tool/Efficiency.java
index b29bc1404..8523c6754 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/tool/Efficiency.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/tool/Efficiency.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/tool/Fortune.java b/src/main/java/org/spout/vanilla/material/enchantment/tool/Fortune.java
index 2f4bff2bc..a71158125 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/tool/Fortune.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/tool/Fortune.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/tool/SilkTouch.java b/src/main/java/org/spout/vanilla/material/enchantment/tool/SilkTouch.java
index e7a35a7fc..b2bb503cf 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/tool/SilkTouch.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/tool/SilkTouch.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/enchantment/tool/Unbreaking.java b/src/main/java/org/spout/vanilla/material/enchantment/tool/Unbreaking.java
index 99a9a5a17..2f74871db 100644
--- a/src/main/java/org/spout/vanilla/material/enchantment/tool/Unbreaking.java
+++ b/src/main/java/org/spout/vanilla/material/enchantment/tool/Unbreaking.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.enchantment.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/BlockItem.java b/src/main/java/org/spout/vanilla/material/item/BlockItem.java
index 830fafd1b..38a5e1b61 100644
--- a/src/main/java/org/spout/vanilla/material/item/BlockItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/BlockItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/Enchantable.java b/src/main/java/org/spout/vanilla/material/item/Enchantable.java
index b3112415a..19b9ca49b 100644
--- a/src/main/java/org/spout/vanilla/material/item/Enchantable.java
+++ b/src/main/java/org/spout/vanilla/material/item/Enchantable.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/Food.java b/src/main/java/org/spout/vanilla/material/item/Food.java
index 98ec958ac..8ad485831 100644
--- a/src/main/java/org/spout/vanilla/material/item/Food.java
+++ b/src/main/java/org/spout/vanilla/material/item/Food.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/FoodEffect.java b/src/main/java/org/spout/vanilla/material/item/FoodEffect.java
index 1138a1583..ae5c2ae09 100644
--- a/src/main/java/org/spout/vanilla/material/item/FoodEffect.java
+++ b/src/main/java/org/spout/vanilla/material/item/FoodEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/RangedWeapon.java b/src/main/java/org/spout/vanilla/material/item/RangedWeapon.java
index a1698924f..f497ef292 100644
--- a/src/main/java/org/spout/vanilla/material/item/RangedWeapon.java
+++ b/src/main/java/org/spout/vanilla/material/item/RangedWeapon.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/VanillaItemMaterial.java b/src/main/java/org/spout/vanilla/material/item/VanillaItemMaterial.java
index 09e31e67c..28e2ae294 100644
--- a/src/main/java/org/spout/vanilla/material/item/VanillaItemMaterial.java
+++ b/src/main/java/org/spout/vanilla/material/item/VanillaItemMaterial.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/Armor.java b/src/main/java/org/spout/vanilla/material/item/armor/Armor.java
index 0e640da12..e83d17c4f 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/Armor.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/Armor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/Boots.java b/src/main/java/org/spout/vanilla/material/item/armor/Boots.java
index 6313f4533..fcda4a764 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/Boots.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/Boots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/Chestplate.java b/src/main/java/org/spout/vanilla/material/item/armor/Chestplate.java
index abd632963..a84ba5126 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/Chestplate.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/Chestplate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/Helmet.java b/src/main/java/org/spout/vanilla/material/item/armor/Helmet.java
index 1c6681b3f..d0769b30f 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/Helmet.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/Helmet.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/Leggings.java b/src/main/java/org/spout/vanilla/material/item/armor/Leggings.java
index 0cc95c743..02c8a3206 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/Leggings.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/Leggings.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainArmor.java b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainArmor.java
index 0f6624135..8d557ef4c 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainArmor.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainArmor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.chain;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainBoots.java b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainBoots.java
index 5a6feb27f..125d55bc6 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainBoots.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainBoots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.chain;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainChestplate.java b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainChestplate.java
index 32e8391cc..fc5bad952 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainChestplate.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainChestplate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.chain;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainHelmet.java b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainHelmet.java
index bcabeff6f..72d88082d 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainHelmet.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainHelmet.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.chain;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainLeggings.java b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainLeggings.java
index dcca828e1..9c35862c4 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainLeggings.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/chain/ChainLeggings.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.chain;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondArmor.java b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondArmor.java
index c986fe9ac..963497e0a 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondArmor.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondArmor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.diamond;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondBoots.java b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondBoots.java
index 64e2b7316..db0f9f4d2 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondBoots.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondBoots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.diamond;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondChestplate.java b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondChestplate.java
index b463036f1..f4ff4be84 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondChestplate.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondChestplate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.diamond;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondHelmet.java b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondHelmet.java
index 330769479..b07329650 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondHelmet.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondHelmet.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.diamond;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondLeggings.java b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondLeggings.java
index dc71ef011..61ad8021f 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondLeggings.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/diamond/DiamondLeggings.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.diamond;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldArmor.java b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldArmor.java
index 29bdfe427..53c5d3289 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldArmor.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldArmor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.gold;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldBoots.java b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldBoots.java
index fc054d5c5..0a2e221c4 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldBoots.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldBoots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.gold;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldChestplate.java b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldChestplate.java
index ce11a5d62..c1770815e 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldChestplate.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldChestplate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.gold;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldHelmet.java b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldHelmet.java
index 805cf0c3f..0da0e62ce 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldHelmet.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldHelmet.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.gold;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldLeggings.java b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldLeggings.java
index f524f55ee..a973a7cee 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldLeggings.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/gold/GoldLeggings.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.gold;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronArmor.java b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronArmor.java
index 593b52cb2..eb3c91466 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronArmor.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronArmor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.iron;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronBoots.java b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronBoots.java
index 1a5d06e80..4bd0832d8 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronBoots.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronBoots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.iron;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronChestplate.java b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronChestplate.java
index a3e2a711a..4e0cc2035 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronChestplate.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronChestplate.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.iron;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronHelmet.java b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronHelmet.java
index 06f81c254..9330cf214 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronHelmet.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronHelmet.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.iron;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronLeggings.java b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronLeggings.java
index 0987cb8d5..9e2900567 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/iron/IronLeggings.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/iron/IronLeggings.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.iron;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherArmor.java b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherArmor.java
index b1467ea29..965a24bf2 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherArmor.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherArmor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.leather;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherBoots.java b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherBoots.java
index e48a44e0a..942bce2bc 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherBoots.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherBoots.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.leather;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherCap.java b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherCap.java
index c80a8c553..e08e822f7 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherCap.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherCap.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.leather;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherPants.java b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherPants.java
index 949a403c4..e0c2e10f3 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherPants.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherPants.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.leather;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherTunic.java b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherTunic.java
index 26ad83b30..02cb0611c 100644
--- a/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherTunic.java
+++ b/src/main/java/org/spout/vanilla/material/item/armor/leather/LeatherTunic.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.armor.leather;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/bucket/EmptyBucket.java b/src/main/java/org/spout/vanilla/material/item/bucket/EmptyBucket.java
index 4bbba761b..b8dc842a3 100644
--- a/src/main/java/org/spout/vanilla/material/item/bucket/EmptyBucket.java
+++ b/src/main/java/org/spout/vanilla/material/item/bucket/EmptyBucket.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.bucket;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/bucket/FullBucket.java b/src/main/java/org/spout/vanilla/material/item/bucket/FullBucket.java
index 07882ba44..c96228fd3 100644
--- a/src/main/java/org/spout/vanilla/material/item/bucket/FullBucket.java
+++ b/src/main/java/org/spout/vanilla/material/item/bucket/FullBucket.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.bucket;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/bucket/LavaBucket.java b/src/main/java/org/spout/vanilla/material/item/bucket/LavaBucket.java
index e6ef07415..30204f7bd 100644
--- a/src/main/java/org/spout/vanilla/material/item/bucket/LavaBucket.java
+++ b/src/main/java/org/spout/vanilla/material/item/bucket/LavaBucket.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.bucket;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/food/Potato.java b/src/main/java/org/spout/vanilla/material/item/food/Potato.java
index d4124b670..ae272cd0c 100644
--- a/src/main/java/org/spout/vanilla/material/item/food/Potato.java
+++ b/src/main/java/org/spout/vanilla/material/item/food/Potato.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.food;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/food/RawBeef.java b/src/main/java/org/spout/vanilla/material/item/food/RawBeef.java
index 5396f3728..dc0a9d3d4 100644
--- a/src/main/java/org/spout/vanilla/material/item/food/RawBeef.java
+++ b/src/main/java/org/spout/vanilla/material/item/food/RawBeef.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.food;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/food/RawChicken.java b/src/main/java/org/spout/vanilla/material/item/food/RawChicken.java
index b0149cf8c..158f93a35 100644
--- a/src/main/java/org/spout/vanilla/material/item/food/RawChicken.java
+++ b/src/main/java/org/spout/vanilla/material/item/food/RawChicken.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.food;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/food/RawFish.java b/src/main/java/org/spout/vanilla/material/item/food/RawFish.java
index 83dba35da..ddb0b1c7f 100644
--- a/src/main/java/org/spout/vanilla/material/item/food/RawFish.java
+++ b/src/main/java/org/spout/vanilla/material/item/food/RawFish.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.food;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/food/RawPorkchop.java b/src/main/java/org/spout/vanilla/material/item/food/RawPorkchop.java
index d9202ef01..d36d21e92 100644
--- a/src/main/java/org/spout/vanilla/material/item/food/RawPorkchop.java
+++ b/src/main/java/org/spout/vanilla/material/item/food/RawPorkchop.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.food;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/minecart/MinecartItem.java b/src/main/java/org/spout/vanilla/material/item/minecart/MinecartItem.java
index 14695d233..a7d46c153 100644
--- a/src/main/java/org/spout/vanilla/material/item/minecart/MinecartItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/minecart/MinecartItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.minecart;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/minecart/PoweredMinecartItem.java b/src/main/java/org/spout/vanilla/material/item/minecart/PoweredMinecartItem.java
index 114854baa..e674b046c 100644
--- a/src/main/java/org/spout/vanilla/material/item/minecart/PoweredMinecartItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/minecart/PoweredMinecartItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.minecart;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/minecart/StorageMinecartItem.java b/src/main/java/org/spout/vanilla/material/item/minecart/StorageMinecartItem.java
index 7367c7c6d..beba78ddd 100644
--- a/src/main/java/org/spout/vanilla/material/item/minecart/StorageMinecartItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/minecart/StorageMinecartItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.minecart;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/BlazeRod.java b/src/main/java/org/spout/vanilla/material/item/misc/BlazeRod.java
index f7748bcf3..c41d22148 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/BlazeRod.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/BlazeRod.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Clay.java b/src/main/java/org/spout/vanilla/material/item/misc/Clay.java
index 0ddac289c..16a07e351 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Clay.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Clay.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Coal.java b/src/main/java/org/spout/vanilla/material/item/misc/Coal.java
index ec0f8aaf7..2053ff286 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Coal.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Coal.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Dye.java b/src/main/java/org/spout/vanilla/material/item/misc/Dye.java
index da18f307a..3907c9b8f 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Dye.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Dye.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/EnchantedBook.java b/src/main/java/org/spout/vanilla/material/item/misc/EnchantedBook.java
index c077885de..f1462b589 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/EnchantedBook.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/EnchantedBook.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Fireworks.java b/src/main/java/org/spout/vanilla/material/item/misc/Fireworks.java
index d4042a84f..a29704cad 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Fireworks.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Fireworks.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/FlowerPot.java b/src/main/java/org/spout/vanilla/material/item/misc/FlowerPot.java
index 6deed1b43..a58130afa 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/FlowerPot.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/FlowerPot.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/MusicDisc.java b/src/main/java/org/spout/vanilla/material/item/misc/MusicDisc.java
index 2c4c5c50c..11d00ff8e 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/MusicDisc.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/MusicDisc.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/PaintingItem.java b/src/main/java/org/spout/vanilla/material/item/misc/PaintingItem.java
index 02081ac12..2bc1fc58d 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/PaintingItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/PaintingItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Potion.java b/src/main/java/org/spout/vanilla/material/item/misc/Potion.java
index 6c346e1f2..1d3def08a 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Potion.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Potion.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Sign.java b/src/main/java/org/spout/vanilla/material/item/misc/Sign.java
index 39e8db9f4..73e1227ff 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Sign.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Sign.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Skull.java b/src/main/java/org/spout/vanilla/material/item/misc/Skull.java
index 9b8df1753..438b7f6f9 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Skull.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Skull.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/SnowballItem.java b/src/main/java/org/spout/vanilla/material/item/misc/SnowballItem.java
index 9eda8eb72..64500cd66 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/SnowballItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/SnowballItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/SpawnEgg.java b/src/main/java/org/spout/vanilla/material/item/misc/SpawnEgg.java
index bd118e8ce..bca3dfcfe 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/SpawnEgg.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/SpawnEgg.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/Stick.java b/src/main/java/org/spout/vanilla/material/item/misc/Stick.java
index d67abb620..7a58d4a71 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/Stick.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/Stick.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/misc/StringItem.java b/src/main/java/org/spout/vanilla/material/item/misc/StringItem.java
index 98df4ba64..49c37889c 100644
--- a/src/main/java/org/spout/vanilla/material/item/misc/StringItem.java
+++ b/src/main/java/org/spout/vanilla/material/item/misc/StringItem.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.misc;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/CarrotOnAStick.java b/src/main/java/org/spout/vanilla/material/item/tool/CarrotOnAStick.java
index 6eb8ae274..fa893fa52 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/CarrotOnAStick.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/CarrotOnAStick.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/FishingRod.java b/src/main/java/org/spout/vanilla/material/item/tool/FishingRod.java
index b91657a97..22c92c97b 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/FishingRod.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/FishingRod.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/FlintAndSteel.java b/src/main/java/org/spout/vanilla/material/item/tool/FlintAndSteel.java
index 9bfaee8da..5b248a278 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/FlintAndSteel.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/FlintAndSteel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/Hoe.java b/src/main/java/org/spout/vanilla/material/item/tool/Hoe.java
index 1539fffc0..1286ba7ff 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/Hoe.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/Hoe.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/InteractTool.java b/src/main/java/org/spout/vanilla/material/item/tool/InteractTool.java
index 72d70e986..bebf82dfa 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/InteractTool.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/InteractTool.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/MiningTool.java b/src/main/java/org/spout/vanilla/material/item/tool/MiningTool.java
index 4c69cdfd8..ae3646852 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/MiningTool.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/MiningTool.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/Shears.java b/src/main/java/org/spout/vanilla/material/item/tool/Shears.java
index 28bdb4241..f1acded5c 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/Shears.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/Shears.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/Tool.java b/src/main/java/org/spout/vanilla/material/item/tool/Tool.java
index e3da438cd..5de273085 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/Tool.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/Tool.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/weapon/Bow.java b/src/main/java/org/spout/vanilla/material/item/tool/weapon/Bow.java
index 2f58e2e12..6516a6b66 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/weapon/Bow.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/weapon/Bow.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool.weapon;
 
diff --git a/src/main/java/org/spout/vanilla/material/item/tool/weapon/Sword.java b/src/main/java/org/spout/vanilla/material/item/tool/weapon/Sword.java
index db3cca962..3ab051852 100644
--- a/src/main/java/org/spout/vanilla/material/item/tool/weapon/Sword.java
+++ b/src/main/java/org/spout/vanilla/material/item/tool/weapon/Sword.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.item.tool.weapon;
 
diff --git a/src/main/java/org/spout/vanilla/material/map/Map.java b/src/main/java/org/spout/vanilla/material/map/Map.java
index 1a5e34422..77794edb9 100644
--- a/src/main/java/org/spout/vanilla/material/map/Map.java
+++ b/src/main/java/org/spout/vanilla/material/map/Map.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.map;
 
diff --git a/src/main/java/org/spout/vanilla/material/map/MapColor.java b/src/main/java/org/spout/vanilla/material/map/MapColor.java
index 3003b11b1..9575f48a2 100644
--- a/src/main/java/org/spout/vanilla/material/map/MapColor.java
+++ b/src/main/java/org/spout/vanilla/material/map/MapColor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.map;
 
diff --git a/src/main/java/org/spout/vanilla/material/map/MapMaterialColor.java b/src/main/java/org/spout/vanilla/material/map/MapMaterialColor.java
index 13398c8f1..ab1e85346 100644
--- a/src/main/java/org/spout/vanilla/material/map/MapMaterialColor.java
+++ b/src/main/java/org/spout/vanilla/material/map/MapMaterialColor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.material.map;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/ChannelBufferUtils.java b/src/main/java/org/spout/vanilla/protocol/ChannelBufferUtils.java
index 96e2cb186..49b240fd8 100644
--- a/src/main/java/org/spout/vanilla/protocol/ChannelBufferUtils.java
+++ b/src/main/java/org/spout/vanilla/protocol/ChannelBufferUtils.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/LANThread.java b/src/main/java/org/spout/vanilla/protocol/LANThread.java
index fa65410de..a5ab536d9 100644
--- a/src/main/java/org/spout/vanilla/protocol/LANThread.java
+++ b/src/main/java/org/spout/vanilla/protocol/LANThread.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/LoginAuth.java b/src/main/java/org/spout/vanilla/protocol/LoginAuth.java
index 8782fe347..e41a95b90 100644
--- a/src/main/java/org/spout/vanilla/protocol/LoginAuth.java
+++ b/src/main/java/org/spout/vanilla/protocol/LoginAuth.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/VanillaCodecLookupService.java b/src/main/java/org/spout/vanilla/protocol/VanillaCodecLookupService.java
index ac75695f5..4ae638c0f 100644
--- a/src/main/java/org/spout/vanilla/protocol/VanillaCodecLookupService.java
+++ b/src/main/java/org/spout/vanilla/protocol/VanillaCodecLookupService.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/VanillaHandlerLookupService.java b/src/main/java/org/spout/vanilla/protocol/VanillaHandlerLookupService.java
index b7e9b3e73..a1606c0ec 100644
--- a/src/main/java/org/spout/vanilla/protocol/VanillaHandlerLookupService.java
+++ b/src/main/java/org/spout/vanilla/protocol/VanillaHandlerLookupService.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/VanillaNetworkSynchronizer.java b/src/main/java/org/spout/vanilla/protocol/VanillaNetworkSynchronizer.java
index 4bf55e8b7..ceeaf56dd 100644
--- a/src/main/java/org/spout/vanilla/protocol/VanillaNetworkSynchronizer.java
+++ b/src/main/java/org/spout/vanilla/protocol/VanillaNetworkSynchronizer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/VanillaProtocol.java b/src/main/java/org/spout/vanilla/protocol/VanillaProtocol.java
index e88cc9263..bfee59e80 100644
--- a/src/main/java/org/spout/vanilla/protocol/VanillaProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/VanillaProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyRequestCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyRequestCodec.java
index 3fc6e5283..728e323a3 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyRequestCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyRequestCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.auth;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyResponseCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyResponseCodec.java
index 622b608e6..b79157a1d 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyResponseCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/auth/EncryptionKeyResponseCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.auth;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityActionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityActionCodec.java
index 0d126a7cf..731b56e46 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityActionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityActionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAnimationCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAnimationCodec.java
index 030e76040..6379ab88f 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAnimationCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAnimationCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAttachEntityCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAttachEntityCodec.java
index 3aa30d632..c85991f5b 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAttachEntityCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityAttachEntityCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityDestroyCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityDestroyCodec.java
index 5fc10c407..a1396f07b 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityDestroyCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityDestroyCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityEquipmentCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityEquipmentCodec.java
index f0baafba2..81a9cdf4f 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityEquipmentCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityEquipmentCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInitializeCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInitializeCodec.java
index a5b8015d7..13239d4c5 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInitializeCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInitializeCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInteractCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInteractCodec.java
index 89d9f53d9..56cf5f2ec 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInteractCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityInteractCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityItemDataCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityItemDataCodec.java
index 776a32ecc..763062068 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityItemDataCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityItemDataCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityMetadataCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityMetadataCodec.java
index cf7631fe2..392005744 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityMetadataCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityMetadataCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityRelativePositionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityRelativePositionCodec.java
index d8f1d4010..72b1824e5 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityRelativePositionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityRelativePositionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityStatusCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityStatusCodec.java
index 3cca28a89..fcf10ae41 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityStatusCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityStatusCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityTileDataCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityTileDataCodec.java
index d3daadc4b..e5798bcd0 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityTileDataCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/EntityTileDataCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityEffectCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityEffectCodec.java
index f1419bd0c..e7ba2fcce 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityEffectCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityEffectCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.effect;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityRemoveEffectCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityRemoveEffectCodec.java
index f03145bae..92f31a0c0 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityRemoveEffectCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/effect/EntityRemoveEffectCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.effect;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityHeadYawCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityHeadYawCodec.java
index c77e93c82..2f5f3f831 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityHeadYawCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityHeadYawCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityRelativePositionYawCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityRelativePositionYawCodec.java
index 791a36f56..9cb109c39 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityRelativePositionYawCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityRelativePositionYawCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityTeleportCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityTeleportCodec.java
index 33e2d2da5..be5ccad10 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityTeleportCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityTeleportCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityVelocityCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityVelocityCodec.java
index 4690772b9..0f683fc4d 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityVelocityCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityVelocityCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityYawCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityYawCodec.java
index 999853ba8..6dcd7e1fd 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityYawCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/pos/EntityYawCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityExperienceOrbCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityExperienceOrbCodec.java
index 76b24dcfa..eeccdffea 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityExperienceOrbCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityExperienceOrbCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityItemCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityItemCodec.java
index 26db8cc00..4ba811be4 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityItemCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityItemCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityMobCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityMobCodec.java
index 1c5b59e6c..5cf8a57be 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityMobCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityMobCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityPaintingCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityPaintingCodec.java
index 871e996fd..d5ba48150 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityPaintingCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityPaintingCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntitySpawnObjectCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntitySpawnObjectCodec.java
index f05ec75eb..f2b58ec9d 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntitySpawnObjectCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntitySpawnObjectCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityThunderboltCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityThunderboltCodec.java
index 79d82f206..121b76c6c 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityThunderboltCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/entity/spawn/EntityThunderboltCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerAbilityCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerAbilityCodec.java
index 41e22f469..fc4038bcc 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerAbilityCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerAbilityCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBedCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBedCodec.java
index fa463c573..f9b6ebda6 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBedCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBedCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBlockPlacementCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBlockPlacementCodec.java
index 6ca7109f6..2e7b1639c 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBlockPlacementCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerBlockPlacementCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerChatCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerChatCodec.java
index f37bf8adf..f28327958 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerChatCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerChatCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerCollectItemCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerCollectItemCodec.java
index 5a5e1994d..4b063b833 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerCollectItemCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerCollectItemCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerDiggingCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerDiggingCodec.java
index 1431f058d..f35e441ac 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerDiggingCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerDiggingCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerExperienceCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerExperienceCodec.java
index d7c1c4ae2..f7c44d5c0 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerExperienceCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerExperienceCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGameStateCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGameStateCodec.java
index 286feb0f4..191717499 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGameStateCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGameStateCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGroundCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGroundCodec.java
index 370fda9b0..888172ece 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGroundCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerGroundCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHealthCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHealthCodec.java
index e1d576ac4..d727cbe5c 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHealthCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHealthCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHeldItemChangeCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHeldItemChangeCodec.java
index a3503fa29..22fd4a633 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHeldItemChangeCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerHeldItemChangeCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerLocaleViewDistanceCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerLocaleViewDistanceCodec.java
index 847ae493b..9c40a25a2 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerLocaleViewDistanceCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerLocaleViewDistanceCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerSoundEffectCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerSoundEffectCodec.java
index 2026222ee..1cbd41066 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerSoundEffectCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerSoundEffectCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatisticCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatisticCodec.java
index d78b720bb..3edea2881 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatisticCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatisticCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatusCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatusCodec.java
index 60a95f42b..704c05ae2 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatusCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerStatusCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTabCompleteCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTabCompleteCodec.java
index 53d50687c..d7d7d6fee 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTabCompleteCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTabCompleteCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTimeCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTimeCodec.java
index 44db7aa31..0faf3a919 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTimeCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/PlayerTimeCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerHandshakeCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerHandshakeCodec.java
index 6ed86eafa..df5d50590 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerHandshakeCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerHandshakeCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerKickCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerKickCodec.java
index 7f2c2a2aa..894594930 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerKickCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerKickCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerListCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerListCodec.java
index 1b4bba8d0..c41c4d298 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerListCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerListCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerLoginRequestCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerLoginRequestCodec.java
index d1d5e8c90..676c3cdc8 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerLoginRequestCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerLoginRequestCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerPingCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerPingCodec.java
index f87e2c16d..2a153ab7c 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerPingCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/conn/PlayerPingCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionCodec.java
index 64e93d1df..b5a683736 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionYawCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionYawCodec.java
index ed725ccc2..8f1725ee8 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionYawCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerPositionYawCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerRespawnCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerRespawnCodec.java
index 957978b6f..a049830d3 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerRespawnCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerRespawnCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnCodec.java
index 2bcc4af89..04171cfd9 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnPositionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnPositionCodec.java
index a19b07249..85672bc79 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnPositionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerSpawnPositionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerYawCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerYawCodec.java
index 3db948c5d..01621c8d4 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerYawCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/player/pos/PlayerYawCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/server/ServerListPingCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/server/ServerListPingCodec.java
index a8165eed6..7c4e0969f 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/server/ServerListPingCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/server/ServerListPingCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.server;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/server/ServerPluginCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/server/ServerPluginCodec.java
index 79e596df1..0119adf8b 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/server/ServerPluginCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/server/ServerPluginCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 /*
  * This file is part of SpoutAPI.
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowClickCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowClickCodec.java
index b8be688ed..9e57a2e2f 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowClickCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowClickCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCloseCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCloseCodec.java
index e94df97ce..f030123cb 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCloseCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCloseCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCreativeActionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCreativeActionCodec.java
index 26f228fb9..2ff1e9392 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCreativeActionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowCreativeActionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowEnchantItemCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowEnchantItemCodec.java
index d5d98ccc9..6f819287a 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowEnchantItemCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowEnchantItemCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowItemsCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowItemsCodec.java
index 39a600ee8..d85dd5a58 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowItemsCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowItemsCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowOpenCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowOpenCodec.java
index 9b2ac8dff..984b3bdd9 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowOpenCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowOpenCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowPropertyCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowPropertyCodec.java
index f38b9670c..16c32ec58 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowPropertyCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowPropertyCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowSlotCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowSlotCodec.java
index 840f662d3..d84afce0e 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowSlotCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowSlotCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowTransactionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowTransactionCodec.java
index 318abffa3..281347888 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/window/WindowTransactionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/window/WindowTransactionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/EffectCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/EffectCodec.java
index fb411a151..483bf5db2 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/EffectCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/EffectCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/ExplosionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/ExplosionCodec.java
index 51e41bc14..dbd65742e 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/ExplosionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/ExplosionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockActionCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockActionCodec.java
index c540593b4..9620f04c3 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockActionCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockActionCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBreakAnimationCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBreakAnimationCodec.java
index ed72f5f47..a3938f7e6 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBreakAnimationCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBreakAnimationCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBulkCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBulkCodec.java
index 0e935e01f..0627ed258 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBulkCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockBulkCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockChangeCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockChangeCodec.java
index 3125f9943..68b97725e 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockChangeCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/block/BlockChangeCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/block/SignCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/block/SignCodec.java
index bc9e42cda..879976a15 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/block/SignCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/block/SignCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkBulkCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkBulkCodec.java
index 5920f9449..f8adf19f5 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkBulkCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkBulkCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.chunk;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkDataCodec.java b/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkDataCodec.java
index ea5d5ae61..fd482d1a9 100644
--- a/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkDataCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/codec/world/chunk/ChunkDataCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.codec.world.chunk;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/container/VanillaContainer.java b/src/main/java/org/spout/vanilla/protocol/container/VanillaContainer.java
index 064734415..722d27e11 100644
--- a/src/main/java/org/spout/vanilla/protocol/container/VanillaContainer.java
+++ b/src/main/java/org/spout/vanilla/protocol/container/VanillaContainer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.container;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/BasicEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/BasicEntityProtocol.java
index 553de086d..3f3f01f46 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/BasicEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/BasicEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/HumanEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/HumanEntityProtocol.java
index 4a4b48f42..250f2d340 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/HumanEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/HumanEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/VanillaEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/VanillaEntityProtocol.java
index 2895285bd..0f0fde8a6 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/VanillaEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/VanillaEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/BlazeEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/BlazeEntityProtocol.java
index 42281b7df..a3d9d7f20 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/BlazeEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/BlazeEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureProtocol.java
index 82436bfe3..bc9c436ad 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureType.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureType.java
index 3a808878d..0932363bd 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureType.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/CreatureType.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/CreeperEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/CreeperEntityProtocol.java
index 37cf3186d..6327a05f6 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/CreeperEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/CreeperEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/EnderDragonEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/EnderDragonEntityProtocol.java
index 96116da4b..08539f226 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/EnderDragonEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/EnderDragonEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/EndermanEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/EndermanEntityProtocol.java
index db1aeb8f9..6050bf1f0 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/EndermanEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/EndermanEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/GhastEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/GhastEntityProtocol.java
index 895e15455..8627bce1f 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/GhastEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/GhastEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/MagmaCubeEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/MagmaCubeEntityProtocol.java
index 68be295e7..d5e42695d 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/MagmaCubeEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/MagmaCubeEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/OcelotEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/OcelotEntityProtocol.java
index 7563ab2ab..559af95f2 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/OcelotEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/OcelotEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/PigEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/PigEntityProtocol.java
index d26a1608a..12504cb87 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/PigEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/PigEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/SheepEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/SheepEntityProtocol.java
index bcbca6c2f..0ac353070 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/SheepEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/SheepEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/SkeletonEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/SkeletonEntityProtocol.java
index a722bc77f..e03621b8e 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/SkeletonEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/SkeletonEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/SlimeEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/SlimeEntityProtocol.java
index 06f85cecd..31b996bb2 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/SlimeEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/SlimeEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/SpiderEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/SpiderEntityProtocol.java
index 213568498..888297f89 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/SpiderEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/SpiderEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/VillagerEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/VillagerEntityProtocol.java
index 01ad855ef..a412b14de 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/VillagerEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/VillagerEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/WitherEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/WitherEntityProtocol.java
index d170ff5cf..2ad645fdb 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/WitherEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/WitherEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/WolfEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/WolfEntityProtocol.java
index 794c6b779..d256758df 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/WolfEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/WolfEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/creature/ZombieEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/creature/ZombieEntityProtocol.java
index 3953e5741..8bf44d70e 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/creature/ZombieEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/creature/ZombieEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.creature;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/ArrowObjectEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/ArrowObjectEntityProtocol.java
index 42b91c358..12ab7d68a 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/ArrowObjectEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/ArrowObjectEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/FallingBlockProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/FallingBlockProtocol.java
index 0d9ae23c1..6170ee7a2 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/FallingBlockProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/FallingBlockProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/FireworkRocketEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/FireworkRocketEntityProtocol.java
index ccfb1cbaa..8e51c926e 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/FireworkRocketEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/FireworkRocketEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/ItemEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/ItemEntityProtocol.java
index 0eaf3f9a9..b4d7577af 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/ItemEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/ItemEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/LightningEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/LightningEntityProtocol.java
index 60f8570a7..06b4cc4c4 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/LightningEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/LightningEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectEntityProtocol.java
index 8fc6170bc..975223c85 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectType.java b/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectType.java
index 7c5f8534f..5902f7d1c 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectType.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/ObjectType.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/PaintingEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/PaintingEntityProtocol.java
index 14a1e0162..b4cccb6ad 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/PaintingEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/PaintingEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/XPOrbEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/XPOrbEntityProtocol.java
index 58ed9cee5..84361f76c 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/XPOrbEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/XPOrbEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/BoatObjectEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/BoatObjectEntityProtocol.java
index dab239b7b..df9935342 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/BoatObjectEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/BoatObjectEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object.vehicle;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/MinecartObjectEntityProtocol.java b/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/MinecartObjectEntityProtocol.java
index 5905b1ce4..9189c2264 100644
--- a/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/MinecartObjectEntityProtocol.java
+++ b/src/main/java/org/spout/vanilla/protocol/entity/object/vehicle/MinecartObjectEntityProtocol.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.entity.object.vehicle;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/EncryptionKeyResponseHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/EncryptionKeyResponseHandler.java
index c57bc6f88..4fba492c5 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/EncryptionKeyResponseHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/EncryptionKeyResponseHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/ServerListPingHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/ServerListPingHandler.java
index 910399c6d..7419ce06e 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/ServerListPingHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/ServerListPingHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityActionHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityActionHandler.java
index 5c6a91b3c..0037bc3e8 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityActionHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityActionHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityAnimationHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityAnimationHandler.java
index ca6a82c68..eca3a9f9d 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityAnimationHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityAnimationHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityInteractHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityInteractHandler.java
index d1992c6d6..e62bb52f1 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityInteractHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/entity/EntityInteractHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/entity/pos/EntityHeadYawHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/entity/pos/EntityHeadYawHandler.java
index 43529213f..4bfa863dd 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/entity/pos/EntityHeadYawHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/entity/pos/EntityHeadYawHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/EntityHealthChangeEvent.java b/src/main/java/org/spout/vanilla/protocol/handler/player/EntityHealthChangeEvent.java
index 92fc95ea1..d6b5ff2fe 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/EntityHealthChangeEvent.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/EntityHealthChangeEvent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 /*
  * This file is part of SpoutAPI.
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerAbilityHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerAbilityHandler.java
index 613d22f34..861d13b33 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerAbilityHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerAbilityHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerBlockPlacementHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerBlockPlacementHandler.java
index d177a39bd..70a58cf6c 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerBlockPlacementHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerBlockPlacementHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerChatHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerChatHandler.java
index ace1edd56..819866054 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerChatHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerChatHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerDiggingHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerDiggingHandler.java
index 79c8ad86b..d830e8c3e 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerDiggingHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerDiggingHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerGroundHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerGroundHandler.java
index fad28daa3..210dec0f9 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerGroundHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerGroundHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerHeldItemChangeHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerHeldItemChangeHandler.java
index d5ac13e9a..1951bbdf4 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerHeldItemChangeHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerHeldItemChangeHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionHandler.java
index d6ed8e7fa..6a2790aba 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionYawHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionYawHandler.java
index 1bb6b2e7f..1565f0eeb 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionYawHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerPositionYawHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerStatusHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerStatusHandler.java
index 003628826..f22818f4a 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerStatusHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerStatusHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerTabCompleteHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerTabCompleteHandler.java
index 59fdc18a8..72127efd7 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerTabCompleteHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerTabCompleteHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerYawHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerYawHandler.java
index 3f681345b..71bc3121c 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerYawHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/PlayerYawHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerHandshakeHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerHandshakeHandler.java
index a54018daf..d0630d464 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerHandshakeHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerHandshakeHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerKickHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerKickHandler.java
index 22dcdb09f..1df9745be 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerKickHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerKickHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerPingHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerPingHandler.java
index 8b517aff9..c8ba3f466 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerPingHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/player/conn/PlayerPingHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowClickHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowClickHandler.java
index 8d8e08485..3b53fe559 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowClickHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowClickHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCloseHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCloseHandler.java
index 3d5588693..cec974856 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCloseHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCloseHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCreativeActionHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCreativeActionHandler.java
index ed8d1c696..cdc041747 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCreativeActionHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowCreativeActionHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowItemsHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowItemsHandler.java
index efb4692b0..a0b831e4c 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowItemsHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowItemsHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowOpenHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowOpenHandler.java
index 69f5677fd..3027eeb3e 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowOpenHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowOpenHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowPropertyHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowPropertyHandler.java
index 8c35b8234..52c6e255e 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowPropertyHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowPropertyHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowSlotHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowSlotHandler.java
index b15b2670a..f57f7657f 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/window/WindowSlotHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/window/WindowSlotHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/world/block/SignHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/world/block/SignHandler.java
index 8af44e581..1f1e1b5c1 100644
--- a/src/main/java/org/spout/vanilla/protocol/handler/world/block/SignHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/handler/world/block/SignHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.handler.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/ServerListPingMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/ServerListPingMessage.java
index 102459342..b71b97f92 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/ServerListPingMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/ServerListPingMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/ServerPluginMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/ServerPluginMessage.java
index 14a26f7ef..2572767cd 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/ServerPluginMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/ServerPluginMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 /*
  * This file is part of SpoutAPI.
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/VanillaBlockDataChannelMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/VanillaBlockDataChannelMessage.java
index e32ccc1bd..b7c84f09a 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/VanillaBlockDataChannelMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/VanillaBlockDataChannelMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/VanillaMainChannelMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/VanillaMainChannelMessage.java
index 360596a5e..b350f1f09 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/VanillaMainChannelMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/VanillaMainChannelMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/VanillaMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/VanillaMessage.java
index 65ee46f09..81747430e 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/VanillaMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/VanillaMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyRequestMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyRequestMessage.java
index 88b544287..d62ac7960 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyRequestMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyRequestMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.auth;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyResponseMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyResponseMessage.java
index 0224e9dfe..7bbdd8c8c 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyResponseMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/auth/EncryptionKeyResponseMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.auth;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityActionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityActionMessage.java
index 0467276c4..f65d4b3ee 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityActionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityActionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAnimationMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAnimationMessage.java
index 7a4ef6f40..7eb95a945 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAnimationMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAnimationMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAttachEntityMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAttachEntityMessage.java
index 1e340f5fe..d24f53a7d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAttachEntityMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityAttachEntityMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityDestroyMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityDestroyMessage.java
index 4ed90fad5..2639dc0d1 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityDestroyMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityDestroyMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityEquipmentMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityEquipmentMessage.java
index 6a9f061d3..2d05617a8 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityEquipmentMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityEquipmentMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInitializeMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInitializeMessage.java
index 3a0cff479..6efb06f64 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInitializeMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInitializeMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInteractMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInteractMessage.java
index bab80f2cd..3b83b12b8 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInteractMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityInteractMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityItemDataMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityItemDataMessage.java
index 7ace999eb..4d605eb38 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityItemDataMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityItemDataMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMessage.java
index e089035d3..d8a876b28 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMetadataMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMetadataMessage.java
index 4fe5a6b6b..6bb4b8f4d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMetadataMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityMetadataMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityStatusMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityStatusMessage.java
index 6d08c01fa..90c92769a 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityStatusMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityStatusMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityTileDataMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityTileDataMessage.java
index 6b5d39b3a..5c87ca847 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityTileDataMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/EntityTileDataMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityEffectMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityEffectMessage.java
index 871ed9945..e3b846e43 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityEffectMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityEffectMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.effect;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityRemoveEffectMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityRemoveEffectMessage.java
index fe862eeec..7fefd214f 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityRemoveEffectMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/effect/EntityRemoveEffectMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.effect;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityHeadYawMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityHeadYawMessage.java
index 4906406d5..70fd57812 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityHeadYawMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityHeadYawMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionMessage.java
index e8653e239..01f8800e7 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionYawMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionYawMessage.java
index a12591228..d4dbb45e6 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionYawMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityRelativePositionYawMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityTeleportMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityTeleportMessage.java
index fde13ae3a..cf9c9b126 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityTeleportMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityTeleportMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityVelocityMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityVelocityMessage.java
index 4e1936c32..6ccc813d2 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityVelocityMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityVelocityMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityYawMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityYawMessage.java
index 4e0ac4a29..f11f40408 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityYawMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/pos/EntityYawMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityExperienceOrbMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityExperienceOrbMessage.java
index 2b77fdd5c..2d39f9112 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityExperienceOrbMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityExperienceOrbMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityItemMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityItemMessage.java
index e9b2b6ac7..8556198bf 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityItemMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityItemMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityMobMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityMobMessage.java
index 20a1e3834..08dcbaae6 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityMobMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityMobMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityObjectMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityObjectMessage.java
index 6a7dd54a3..a1136e9bf 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityObjectMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityObjectMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityPaintingMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityPaintingMessage.java
index a7e8f25d4..a3cde1749 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityPaintingMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityPaintingMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityThunderboltMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityThunderboltMessage.java
index 7498fa6bc..1fdda7db3 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityThunderboltMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/entity/spawn/EntityThunderboltMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.entity.spawn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerAbilityMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerAbilityMessage.java
index 74ff9114e..29979e01c 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerAbilityMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerAbilityMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBedMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBedMessage.java
index 961ca0b6e..2a4156fca 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBedMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBedMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBlockPlacementMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBlockPlacementMessage.java
index 21bf3619b..6d3beca1c 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBlockPlacementMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerBlockPlacementMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerChatMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerChatMessage.java
index 4a5031d71..754c7869f 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerChatMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerChatMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerCollectItemMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerCollectItemMessage.java
index f236e3640..26f627622 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerCollectItemMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerCollectItemMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerDiggingMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerDiggingMessage.java
index b1c8466ec..80f8697d5 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerDiggingMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerDiggingMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerExperienceMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerExperienceMessage.java
index 3fa2a0021..0effaf40d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerExperienceMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerExperienceMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGameStateMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGameStateMessage.java
index 6d5943f98..395642c0f 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGameStateMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGameStateMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGroundMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGroundMessage.java
index 41e50ae2e..e779d456f 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGroundMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerGroundMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHealthMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHealthMessage.java
index 82da5972b..613e83e4d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHealthMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHealthMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHeldItemChangeMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHeldItemChangeMessage.java
index c5505cf8d..bc221ee47 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHeldItemChangeMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerHeldItemChangeMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerLocaleViewDistanceMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerLocaleViewDistanceMessage.java
index ec7ec57c7..c3ee7311d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerLocaleViewDistanceMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerLocaleViewDistanceMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerSoundEffectMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerSoundEffectMessage.java
index 296a07951..1a5098404 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerSoundEffectMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerSoundEffectMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatisticMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatisticMessage.java
index c2999a2de..f49f75af9 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatisticMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatisticMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatusMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatusMessage.java
index 59d7171f5..74f538040 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatusMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerStatusMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTabCompleteMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTabCompleteMessage.java
index e7625b1e7..8792bc31e 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTabCompleteMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTabCompleteMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTimeMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTimeMessage.java
index acb044944..09a1dbb48 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTimeMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/PlayerTimeMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerHandshakeMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerHandshakeMessage.java
index 15fc4efb7..b8de7c09b 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerHandshakeMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerHandshakeMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerKickMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerKickMessage.java
index 5a2fddef0..a3957ea77 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerKickMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerKickMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerListMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerListMessage.java
index 311531ded..611879a7a 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerListMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerListMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerLoginRequestMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerLoginRequestMessage.java
index 69ed1100c..e119d2d5d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerLoginRequestMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerLoginRequestMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerPingMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerPingMessage.java
index 8db94be5f..e14ab1c4a 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerPingMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/conn/PlayerPingMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.conn;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionMessage.java
index 796653089..6d07fccd4 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionYawMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionYawMessage.java
index 6bdc9c002..71f296265 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionYawMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerPositionYawMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerRespawnMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerRespawnMessage.java
index 89b85da99..adc723530 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerRespawnMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerRespawnMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnMessage.java
index ba4d0a07f..f7ccf9c87 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnPositionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnPositionMessage.java
index 16eb02737..c2906d30d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnPositionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerSpawnPositionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerYawMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerYawMessage.java
index 62c2c06f0..078f70ef5 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerYawMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/player/pos/PlayerYawMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.player.pos;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowClickMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowClickMessage.java
index 0707d641b..76e24c30a 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowClickMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowClickMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCloseMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCloseMessage.java
index 941bcd374..bae1c455b 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCloseMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCloseMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCreativeActionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCreativeActionMessage.java
index 64d1fd8e0..58d46cf3e 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCreativeActionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowCreativeActionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowEnchantItemMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowEnchantItemMessage.java
index fc019e65c..93ee9994a 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowEnchantItemMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowEnchantItemMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowItemsMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowItemsMessage.java
index 3baaedfbc..0c4bf038e 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowItemsMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowItemsMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowMessage.java
index afeafd25f..68498997d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowOpenMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowOpenMessage.java
index d03ed0751..196f2173d 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowOpenMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowOpenMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowPropertyMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowPropertyMessage.java
index 7ad621639..2fd04d2e3 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowPropertyMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowPropertyMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowSlotMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowSlotMessage.java
index 5da583071..400c0e13f 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowSlotMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowSlotMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowTransactionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowTransactionMessage.java
index 876c0ddf6..f5bc8e2f8 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/window/WindowTransactionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/window/WindowTransactionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.window;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/EffectMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/EffectMessage.java
index 365af874e..ed7a39c42 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/EffectMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/EffectMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/ExplosionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/ExplosionMessage.java
index e40be5228..3d121fba8 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/ExplosionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/ExplosionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockActionMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockActionMessage.java
index f70667533..296c4775f 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockActionMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockActionMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBreakAnimationMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBreakAnimationMessage.java
index c54f2867f..513ec9dca 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBreakAnimationMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBreakAnimationMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBulkMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBulkMessage.java
index f514a83ee..4868927f9 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBulkMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockBulkMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockChangeMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockChangeMessage.java
index 59082e061..d94121500 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockChangeMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/block/BlockChangeMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/block/SignMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/block/SignMessage.java
index 4619b9bd1..c2de4dcc3 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/block/SignMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/block/SignMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.block;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkBulkMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkBulkMessage.java
index b58a76e5b..01f929e8c 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkBulkMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkBulkMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.chunk;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkDataMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkDataMessage.java
index 4f5925560..84cfb8019 100644
--- a/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkDataMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/msg/world/chunk/ChunkDataMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.msg.world.chunk;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/netcache/ChunkNetCache.java b/src/main/java/org/spout/vanilla/protocol/netcache/ChunkNetCache.java
index af406ab8d..bd8dd687f 100644
--- a/src/main/java/org/spout/vanilla/protocol/netcache/ChunkNetCache.java
+++ b/src/main/java/org/spout/vanilla/protocol/netcache/ChunkNetCache.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.netcache;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/netcache/PartitionChunk.java b/src/main/java/org/spout/vanilla/protocol/netcache/PartitionChunk.java
index b07d961a5..d40b7684b 100644
--- a/src/main/java/org/spout/vanilla/protocol/netcache/PartitionChunk.java
+++ b/src/main/java/org/spout/vanilla/protocol/netcache/PartitionChunk.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.netcache;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheCodec.java b/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheCodec.java
index 0ff222df0..7f6e43924 100644
--- a/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.netcache.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheHandler.java b/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheHandler.java
index e1eb1407d..b8369deca 100644
--- a/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.netcache.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheMessage.java b/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheMessage.java
index 868e15eeb..61cbe3562 100644
--- a/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/netcache/protocol/ChunkCacheMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.netcache.protocol;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelCodec.java b/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelCodec.java
index 1457e0614..ea4d36837 100644
--- a/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.plugin;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessage.java b/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessage.java
index 4eb96b120..3f19a8bbe 100644
--- a/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.plugin;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessageHandler.java
index edefec68d..5c90ebe7e 100644
--- a/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessageHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/plugin/RegisterPluginChannelMessageHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.plugin;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelCodec.java b/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelCodec.java
index 4f8c53e80..4aebafe86 100644
--- a/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.plugin;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessage.java b/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessage.java
index a5088383a..57ee423d2 100644
--- a/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.plugin;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessageHandler.java
index 7838008ff..da637356f 100644
--- a/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessageHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/plugin/UnregisterPluginChannelMessageHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.plugin;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/proxy/VanillaConnectionInfo.java b/src/main/java/org/spout/vanilla/protocol/proxy/VanillaConnectionInfo.java
index decf70485..1e658c1b2 100644
--- a/src/main/java/org/spout/vanilla/protocol/proxy/VanillaConnectionInfo.java
+++ b/src/main/java/org/spout/vanilla/protocol/proxy/VanillaConnectionInfo.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.proxy;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RconCodecLookupService.java b/src/main/java/org/spout/vanilla/protocol/rcon/RconCodecLookupService.java
index 219d17c72..c8002812e 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RconCodecLookupService.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RconCodecLookupService.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RconConfiguration.java b/src/main/java/org/spout/vanilla/protocol/rcon/RconConfiguration.java
index 12e1cccd7..0833ada3a 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RconConfiguration.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RconConfiguration.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RconDecoder.java b/src/main/java/org/spout/vanilla/protocol/rcon/RconDecoder.java
index f4d644226..362630145 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RconDecoder.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RconDecoder.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RconEncoder.java b/src/main/java/org/spout/vanilla/protocol/rcon/RconEncoder.java
index e80d2196c..5cf4f90c7 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RconEncoder.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RconEncoder.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RconHandler.java b/src/main/java/org/spout/vanilla/protocol/rcon/RconHandler.java
index 32bff62be..52aec0b95 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RconHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RconHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionCore.java b/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionCore.java
index 3093d8f9a..56f081580 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionCore.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionCore.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionServer.java b/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionServer.java
index 04ee2dc11..430ad1062 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionServer.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionServer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionSession.java b/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionSession.java
index 1eb510dc6..af9317b43 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionSession.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/RemoteConnectionSession.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/codec/AuthCodec.java b/src/main/java/org/spout/vanilla/protocol/rcon/codec/AuthCodec.java
index 5a4ec10e3..a59a9e5cd 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/codec/AuthCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/codec/AuthCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.codec;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandCodec.java b/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandCodec.java
index cf885460b..6fd2877be 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.codec;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandResponseCodec.java b/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandResponseCodec.java
index c4fb13734..4c7ed8160 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandResponseCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/codec/CommandResponseCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.codec;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/codec/RconCodec.java b/src/main/java/org/spout/vanilla/protocol/rcon/codec/RconCodec.java
index 3d7ecc8ac..13cdd4a39 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/codec/RconCodec.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/codec/RconCodec.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.codec;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/handler/AuthMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/rcon/handler/AuthMessageHandler.java
index c09dc4499..c48c65241 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/handler/AuthMessageHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/handler/AuthMessageHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandMessageHandler.java
index 36a1532b1..56e29298d 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandMessageHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandMessageHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandResponseMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandResponseMessageHandler.java
index b65fb260c..32dc626b3 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandResponseMessageHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/handler/CommandResponseMessageHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconHandlerLookupService.java b/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconHandlerLookupService.java
index 9f35b466c..f32d3885f 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconHandlerLookupService.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconHandlerLookupService.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconMessageHandler.java
index aa347398d..c373814b9 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconMessageHandler.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/handler/RconMessageHandler.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.handler;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/msg/AuthMessage.java b/src/main/java/org/spout/vanilla/protocol/rcon/msg/AuthMessage.java
index bdda13b92..8a7bd6c2e 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/msg/AuthMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/msg/AuthMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandMessage.java b/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandMessage.java
index a54a9fd7e..ee43a883c 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandResponseMessage.java b/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandResponseMessage.java
index a9ab61750..d946a4fc6 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandResponseMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/msg/CommandResponseMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.msg;
 
diff --git a/src/main/java/org/spout/vanilla/protocol/rcon/msg/RconMessage.java b/src/main/java/org/spout/vanilla/protocol/rcon/msg/RconMessage.java
index ea9134a69..d38e8c1e5 100644
--- a/src/main/java/org/spout/vanilla/protocol/rcon/msg/RconMessage.java
+++ b/src/main/java/org/spout/vanilla/protocol/rcon/msg/RconMessage.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol.rcon.msg;
 
diff --git a/src/main/java/org/spout/vanilla/render/BiomeColorBufferEffect.java b/src/main/java/org/spout/vanilla/render/BiomeColorBufferEffect.java
index 5bd130483..4824aed36 100644
--- a/src/main/java/org/spout/vanilla/render/BiomeColorBufferEffect.java
+++ b/src/main/java/org/spout/vanilla/render/BiomeColorBufferEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/BiomeFoliageColorBufferEffect.java b/src/main/java/org/spout/vanilla/render/BiomeFoliageColorBufferEffect.java
index ef4011dae..37f95b49c 100644
--- a/src/main/java/org/spout/vanilla/render/BiomeFoliageColorBufferEffect.java
+++ b/src/main/java/org/spout/vanilla/render/BiomeFoliageColorBufferEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/BiomeGrassColorBufferEffect.java b/src/main/java/org/spout/vanilla/render/BiomeGrassColorBufferEffect.java
index 41716a0f2..f737e029d 100644
--- a/src/main/java/org/spout/vanilla/render/BiomeGrassColorBufferEffect.java
+++ b/src/main/java/org/spout/vanilla/render/BiomeGrassColorBufferEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/BiomeWaterColorBufferEffect.java b/src/main/java/org/spout/vanilla/render/BiomeWaterColorBufferEffect.java
index 9b0f7430c..3e3d8e7cb 100644
--- a/src/main/java/org/spout/vanilla/render/BiomeWaterColorBufferEffect.java
+++ b/src/main/java/org/spout/vanilla/render/BiomeWaterColorBufferEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/LightBufferEffect.java b/src/main/java/org/spout/vanilla/render/LightBufferEffect.java
index 458ac9731..95d5e173f 100644
--- a/src/main/java/org/spout/vanilla/render/LightBufferEffect.java
+++ b/src/main/java/org/spout/vanilla/render/LightBufferEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
@@ -47,8 +47,8 @@ public void post(ChunkSnapshotModel chunkModel, BufferContainer container) {
 		 * WE CAN'T USE 3 IF 2 ISN'T USED
 		 * 
 		 * One float per vertice
-		 * file://Vanilla/resources/shaders/terrain.120.vert 
-		 * file://Vanilla/resources/shaders/terrain.330.vert
+		 * file://Vanilla/shaders/terrain.120.vert 
+		 * file://Vanilla/shaders/terrain.330.vert
 		 */
 
 		TFloatArrayList lightBuffer = (TFloatArrayList) container.getBuffers().get(1);
diff --git a/src/main/java/org/spout/vanilla/render/LightRenderEffect.java b/src/main/java/org/spout/vanilla/render/LightRenderEffect.java
index 1a45eaee4..bd0323201 100644
--- a/src/main/java/org/spout/vanilla/render/LightRenderEffect.java
+++ b/src/main/java/org/spout/vanilla/render/LightRenderEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/LiquidRenderEffect.java b/src/main/java/org/spout/vanilla/render/LiquidRenderEffect.java
index bbdc3a300..9579811a2 100644
--- a/src/main/java/org/spout/vanilla/render/LiquidRenderEffect.java
+++ b/src/main/java/org/spout/vanilla/render/LiquidRenderEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/TallGrassOffsetEffect.java b/src/main/java/org/spout/vanilla/render/TallGrassOffsetEffect.java
index d3ae8342b..38e54259d 100644
--- a/src/main/java/org/spout/vanilla/render/TallGrassOffsetEffect.java
+++ b/src/main/java/org/spout/vanilla/render/TallGrassOffsetEffect.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/render/VanillaEffects.java b/src/main/java/org/spout/vanilla/render/VanillaEffects.java
index e83226994..6f4e5c6f0 100644
--- a/src/main/java/org/spout/vanilla/render/VanillaEffects.java
+++ b/src/main/java/org/spout/vanilla/render/VanillaEffects.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.render;
 
diff --git a/src/main/java/org/spout/vanilla/resources/MapPalette.java b/src/main/java/org/spout/vanilla/resources/MapPalette.java
index fe6c4cea3..12387d95e 100644
--- a/src/main/java/org/spout/vanilla/resources/MapPalette.java
+++ b/src/main/java/org/spout/vanilla/resources/MapPalette.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.resources;
 
diff --git a/src/main/java/org/spout/vanilla/resources/RecipeYaml.java b/src/main/java/org/spout/vanilla/resources/RecipeYaml.java
index a3e6786e3..98d592942 100644
--- a/src/main/java/org/spout/vanilla/resources/RecipeYaml.java
+++ b/src/main/java/org/spout/vanilla/resources/RecipeYaml.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.resources;
 
diff --git a/src/main/java/org/spout/vanilla/resources/loader/MapPaletteLoader.java b/src/main/java/org/spout/vanilla/resources/loader/MapPaletteLoader.java
index 2a19218f6..8d36476b2 100644
--- a/src/main/java/org/spout/vanilla/resources/loader/MapPaletteLoader.java
+++ b/src/main/java/org/spout/vanilla/resources/loader/MapPaletteLoader.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.resources.loader;
 
@@ -56,7 +56,7 @@ public MapPalette getResource(InputStream stream) {
 
 	@Override
 	public String getFallbackResourceName() {
-		return "mappalette://Vanilla/resources/map/mapColorPalette.dat";
+		return "mappalette://Vanilla/map/mapColorPalette.dat";
 	}
 
 	@Override
diff --git a/src/main/java/org/spout/vanilla/resources/loader/RecipeLoader.java b/src/main/java/org/spout/vanilla/resources/loader/RecipeLoader.java
index 279bf34cb..0aab3c955 100644
--- a/src/main/java/org/spout/vanilla/resources/loader/RecipeLoader.java
+++ b/src/main/java/org/spout/vanilla/resources/loader/RecipeLoader.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.resources.loader;
 
@@ -49,7 +49,7 @@
 public class RecipeLoader extends BasicResourceLoader<RecipeYaml> {
 	@Override
 	public String getFallbackResourceName() {
-		return "recipe://Vanilla/resources/recipes.yml";
+		return "recipe://Vanilla/recipes.yml";
 	}
 
 	@Override
diff --git a/src/main/java/org/spout/vanilla/service/VanillaProtectionService.java b/src/main/java/org/spout/vanilla/service/VanillaProtectionService.java
index c818471c3..95ff41a13 100644
--- a/src/main/java/org/spout/vanilla/service/VanillaProtectionService.java
+++ b/src/main/java/org/spout/vanilla/service/VanillaProtectionService.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.service;
 
diff --git a/src/main/java/org/spout/vanilla/service/protection/SpawnProtection.java b/src/main/java/org/spout/vanilla/service/protection/SpawnProtection.java
index fc72c285a..14205c358 100644
--- a/src/main/java/org/spout/vanilla/service/protection/SpawnProtection.java
+++ b/src/main/java/org/spout/vanilla/service/protection/SpawnProtection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.service.protection;
 
diff --git a/src/main/java/org/spout/vanilla/source/DamageCause.java b/src/main/java/org/spout/vanilla/source/DamageCause.java
index f13a17684..9a36fa5ca 100644
--- a/src/main/java/org/spout/vanilla/source/DamageCause.java
+++ b/src/main/java/org/spout/vanilla/source/DamageCause.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.source;
 
diff --git a/src/main/java/org/spout/vanilla/source/HealthChangeCause.java b/src/main/java/org/spout/vanilla/source/HealthChangeCause.java
index d1ca2924f..da19f0be3 100644
--- a/src/main/java/org/spout/vanilla/source/HealthChangeCause.java
+++ b/src/main/java/org/spout/vanilla/source/HealthChangeCause.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.source;
 
diff --git a/src/main/java/org/spout/vanilla/thread/SpawnLoaderThread.java b/src/main/java/org/spout/vanilla/thread/SpawnLoaderThread.java
index 82364978b..43319cbb5 100644
--- a/src/main/java/org/spout/vanilla/thread/SpawnLoaderThread.java
+++ b/src/main/java/org/spout/vanilla/thread/SpawnLoaderThread.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.thread;
 
diff --git a/src/main/java/org/spout/vanilla/util/ColorSerializer.java b/src/main/java/org/spout/vanilla/util/ColorSerializer.java
index 421da2c95..736c827c7 100644
--- a/src/main/java/org/spout/vanilla/util/ColorSerializer.java
+++ b/src/main/java/org/spout/vanilla/util/ColorSerializer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util;
 
diff --git a/src/main/java/org/spout/vanilla/util/MathHelper.java b/src/main/java/org/spout/vanilla/util/MathHelper.java
index e07bff3b2..349516582 100644
--- a/src/main/java/org/spout/vanilla/util/MathHelper.java
+++ b/src/main/java/org/spout/vanilla/util/MathHelper.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util;
 
diff --git a/src/main/java/org/spout/vanilla/util/MinecartTrackLogic.java b/src/main/java/org/spout/vanilla/util/MinecartTrackLogic.java
index 4b2b670b3..8d44265aa 100644
--- a/src/main/java/org/spout/vanilla/util/MinecartTrackLogic.java
+++ b/src/main/java/org/spout/vanilla/util/MinecartTrackLogic.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util;
 
diff --git a/src/main/java/org/spout/vanilla/util/PlayerUtil.java b/src/main/java/org/spout/vanilla/util/PlayerUtil.java
index 5573fd8aa..98f477e45 100644
--- a/src/main/java/org/spout/vanilla/util/PlayerUtil.java
+++ b/src/main/java/org/spout/vanilla/util/PlayerUtil.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util;
 
diff --git a/src/main/java/org/spout/vanilla/util/RedstoneUtil.java b/src/main/java/org/spout/vanilla/util/RedstoneUtil.java
index 87afa661b..61809898f 100644
--- a/src/main/java/org/spout/vanilla/util/RedstoneUtil.java
+++ b/src/main/java/org/spout/vanilla/util/RedstoneUtil.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util;
 
diff --git a/src/main/java/org/spout/vanilla/util/explosion/ExplosionBlockSlot.java b/src/main/java/org/spout/vanilla/util/explosion/ExplosionBlockSlot.java
index 333223734..c12c93f45 100644
--- a/src/main/java/org/spout/vanilla/util/explosion/ExplosionBlockSlot.java
+++ b/src/main/java/org/spout/vanilla/util/explosion/ExplosionBlockSlot.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.explosion;
 
diff --git a/src/main/java/org/spout/vanilla/util/explosion/ExplosionLayer.java b/src/main/java/org/spout/vanilla/util/explosion/ExplosionLayer.java
index bc6462d0c..4a9c825de 100644
--- a/src/main/java/org/spout/vanilla/util/explosion/ExplosionLayer.java
+++ b/src/main/java/org/spout/vanilla/util/explosion/ExplosionLayer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.explosion;
 
diff --git a/src/main/java/org/spout/vanilla/util/explosion/ExplosionModel.java b/src/main/java/org/spout/vanilla/util/explosion/ExplosionModel.java
index 1a62d8eb0..a01bb1208 100644
--- a/src/main/java/org/spout/vanilla/util/explosion/ExplosionModel.java
+++ b/src/main/java/org/spout/vanilla/util/explosion/ExplosionModel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.explosion;
 
diff --git a/src/main/java/org/spout/vanilla/util/explosion/ExplosionModelSpherical.java b/src/main/java/org/spout/vanilla/util/explosion/ExplosionModelSpherical.java
index deb192deb..12a57c874 100755
--- a/src/main/java/org/spout/vanilla/util/explosion/ExplosionModelSpherical.java
+++ b/src/main/java/org/spout/vanilla/util/explosion/ExplosionModelSpherical.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.explosion;
 
diff --git a/src/main/java/org/spout/vanilla/util/explosion/ExplosionModels.java b/src/main/java/org/spout/vanilla/util/explosion/ExplosionModels.java
index 25bf43dd2..429aef790 100644
--- a/src/main/java/org/spout/vanilla/util/explosion/ExplosionModels.java
+++ b/src/main/java/org/spout/vanilla/util/explosion/ExplosionModels.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.explosion;
 
diff --git a/src/main/java/org/spout/vanilla/util/explosion/ExplosionSlot.java b/src/main/java/org/spout/vanilla/util/explosion/ExplosionSlot.java
index 0592ed579..7237c34f2 100644
--- a/src/main/java/org/spout/vanilla/util/explosion/ExplosionSlot.java
+++ b/src/main/java/org/spout/vanilla/util/explosion/ExplosionSlot.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.explosion;
 
diff --git a/src/main/java/org/spout/vanilla/util/flowing/LiquidModel.java b/src/main/java/org/spout/vanilla/util/flowing/LiquidModel.java
index 55340a64b..a2650aacd 100644
--- a/src/main/java/org/spout/vanilla/util/flowing/LiquidModel.java
+++ b/src/main/java/org/spout/vanilla/util/flowing/LiquidModel.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.util.flowing;
 
diff --git a/src/main/java/org/spout/vanilla/world/LightningSimulator.java b/src/main/java/org/spout/vanilla/world/LightningSimulator.java
index 073e3367f..414d4200b 100644
--- a/src/main/java/org/spout/vanilla/world/LightningSimulator.java
+++ b/src/main/java/org/spout/vanilla/world/LightningSimulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world;
 
diff --git a/src/main/java/org/spout/vanilla/world/WeatherSimulator.java b/src/main/java/org/spout/vanilla/world/WeatherSimulator.java
index 47cbbac40..3ee71ec19 100644
--- a/src/main/java/org/spout/vanilla/world/WeatherSimulator.java
+++ b/src/main/java/org/spout/vanilla/world/WeatherSimulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/VanillaBiomeGenerator.java b/src/main/java/org/spout/vanilla/world/generator/VanillaBiomeGenerator.java
index 38e24c573..a1eea97cc 100644
--- a/src/main/java/org/spout/vanilla/world/generator/VanillaBiomeGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/VanillaBiomeGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/VanillaGenerator.java b/src/main/java/org/spout/vanilla/world/generator/VanillaGenerator.java
index bf1e6184f..eb1bcdd3d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/VanillaGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/VanillaGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/VanillaGenerators.java b/src/main/java/org/spout/vanilla/world/generator/VanillaGenerators.java
index 5b7943cdc..5c7c552a3 100644
--- a/src/main/java/org/spout/vanilla/world/generator/VanillaGenerators.java
+++ b/src/main/java/org/spout/vanilla/world/generator/VanillaGenerators.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/VanillaSingleBiomeGenerator.java b/src/main/java/org/spout/vanilla/world/generator/VanillaSingleBiomeGenerator.java
index d73b62b87..8c2741b9b 100644
--- a/src/main/java/org/spout/vanilla/world/generator/VanillaSingleBiomeGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/VanillaSingleBiomeGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiome.java b/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiome.java
index 7b1a2d0ec..4fbe1f9d7 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiomes.java b/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiomes.java
index 7fb62b4cc..f50867389 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiomes.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/VanillaBiomes.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorElement.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorElement.java
index ae0e63ef4..92c6ab2ca 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorElement.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorElement.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorLayer.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorLayer.java
index c40361c15..382bdf36b 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorLayer.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/BiomeSelectorLayer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/CylindersRangeLayer.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/CylindersRangeLayer.java
index 43f5899b9..e6aa1386e 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/CylindersRangeLayer.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/CylindersRangeLayer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/LayeredBiomeSelector.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/LayeredBiomeSelector.java
index 9ebc98494..671e20eea 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/LayeredBiomeSelector.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/LayeredBiomeSelector.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/NoiseRangeLayer.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/NoiseRangeLayer.java
index 6cdb2aa0a..25113af16 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/NoiseRangeLayer.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/NoiseRangeLayer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/PerlinRangeLayer.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/PerlinRangeLayer.java
index 8ab6aba4f..c03c8f769 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/PerlinRangeLayer.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/PerlinRangeLayer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/biome/selector/VoronoiLayer.java b/src/main/java/org/spout/vanilla/world/generator/biome/selector/VoronoiLayer.java
index 7bda08601..08c7f9de0 100644
--- a/src/main/java/org/spout/vanilla/world/generator/biome/selector/VoronoiLayer.java
+++ b/src/main/java/org/spout/vanilla/world/generator/biome/selector/VoronoiLayer.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.biome.selector;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/flat/FlatGenerator.java b/src/main/java/org/spout/vanilla/world/generator/flat/FlatGenerator.java
index e8a530bbc..9d04adddc 100644
--- a/src/main/java/org/spout/vanilla/world/generator/flat/FlatGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/flat/FlatGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.flat;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/NetherGenerator.java b/src/main/java/org/spout/vanilla/world/generator/nether/NetherGenerator.java
index 1e6a27f96..e98f42817 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/NetherGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/NetherGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/biome/NetherrackBiome.java b/src/main/java/org/spout/vanilla/world/generator/nether/biome/NetherrackBiome.java
index e1a41c4f5..85c77d4aa 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/biome/NetherrackBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/biome/NetherrackBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.biome;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/FireDecorator.java b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/FireDecorator.java
index 3fd43a5a8..123d4df7c 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/FireDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/FireDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/GlowstoneDecorator.java b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/GlowstoneDecorator.java
index cc4fcf39e..f9bc8012a 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/GlowstoneDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/GlowstoneDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/LavaFallDecorator.java b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/LavaFallDecorator.java
index 6bcec83c3..600f6573a 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/LavaFallDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/LavaFallDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/NetherMushroomDecorator.java b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/NetherMushroomDecorator.java
index 7fecacd05..5019a2a41 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/decorator/NetherMushroomDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/decorator/NetherMushroomDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/object/GlowstonePatchObject.java b/src/main/java/org/spout/vanilla/world/generator/nether/object/GlowstonePatchObject.java
index 44c31d686..6489d59b0 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/object/GlowstonePatchObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/object/GlowstonePatchObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/object/NetherPortalObject.java b/src/main/java/org/spout/vanilla/world/generator/nether/object/NetherPortalObject.java
index 79bfe5dd1..d5f2f6531 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/object/NetherPortalObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/object/NetherPortalObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/populator/BlockPatchPopulator.java b/src/main/java/org/spout/vanilla/world/generator/nether/populator/BlockPatchPopulator.java
index 02b11e672..75445947d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/populator/BlockPatchPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/populator/BlockPatchPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/nether/populator/NetherCavePopulator.java b/src/main/java/org/spout/vanilla/world/generator/nether/populator/NetherCavePopulator.java
index 47f546d2a..a05be8974 100644
--- a/src/main/java/org/spout/vanilla/world/generator/nether/populator/NetherCavePopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/nether/populator/NetherCavePopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.nether.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/NormalGenerator.java b/src/main/java/org/spout/vanilla/world/generator/normal/NormalGenerator.java
index 60182c427..bacecb345 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/NormalGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/NormalGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/NormalBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/NormalBiome.java
index bdff6bb92..2a3fc536b 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/NormalBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/NormalBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestBiome.java
index 567c077e3..08bcb2373 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestHillsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestHillsBiome.java
index 59e7eb9e3..83fec6960 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestHillsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/ForestHillsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/GrassyBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/GrassyBiome.java
index b2c178cf3..0ed5117a1 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/GrassyBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/GrassyBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleBiome.java
index 76b1f7c25..046c99c86 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleHillsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleHillsBiome.java
index 1ddfcd02d..41f3cfbac 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleHillsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/JungleHillsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MountainsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MountainsBiome.java
index 42e31bae3..f6d21c270 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MountainsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MountainsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomBiome.java
index 56924906c..06ad99512 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomShoreBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomShoreBiome.java
index 6952aa3d4..f67677ca8 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomShoreBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/MushroomShoreBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/OceanBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/OceanBiome.java
index e34251fd2..ea1643669 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/OceanBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/OceanBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/PlainBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/PlainBiome.java
index 4a68d164a..e55da323d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/PlainBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/PlainBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/RiverBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/RiverBiome.java
index 485a5603d..3cc3ecb38 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/RiverBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/RiverBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SmallMountainsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SmallMountainsBiome.java
index 039796d1b..4743cbddb 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SmallMountainsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SmallMountainsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SwampBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SwampBiome.java
index d36953cfb..82c502934 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SwampBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/grassy/SwampBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.grassy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/BeachBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/BeachBiome.java
index 04ffa7958..918a139da 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/BeachBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/BeachBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.sandy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertBiome.java
index f4013a2a1..03e0dca96 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.sandy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertHillsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertHillsBiome.java
index f88cf71c2..53bd8043e 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertHillsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/DesertHillsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.sandy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/SandyBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/SandyBiome.java
index 278363522..6e88f8140 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/SandyBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/sandy/SandyBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.sandy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenOceanBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenOceanBiome.java
index f6cdef0bd..7c5bef05a 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenOceanBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenOceanBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenRiverBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenRiverBiome.java
index 5e507ea1f..190c73dcc 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenRiverBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/FrozenRiverBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/SnowyBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/SnowyBiome.java
index 9a82b9755..7fabab11b 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/SnowyBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/SnowyBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaBiome.java
index 440d23ee6..c26bbad96 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaHillsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaHillsBiome.java
index a24f068f0..0b96bb308 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaHillsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TaigaHillsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraBiome.java
index 667f9a33c..c938b65d2 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraHillsBiome.java b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraHillsBiome.java
index 99d16f8ef..6200057a0 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraHillsBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/biome/snowy/TundraHillsBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.biome.snowy;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/CactusDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/CactusDecorator.java
index 93233e29c..cfd6788ca 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/CactusDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/CactusDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/DeadBushDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/DeadBushDecorator.java
index 8b3b8939d..6c395cf42 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/DeadBushDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/DeadBushDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/EmeraldOreDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/EmeraldOreDecorator.java
index c809b85e2..cbd65f1df 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/EmeraldOreDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/EmeraldOreDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/FlowerDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/FlowerDecorator.java
index 48fd5b04d..9eea54e60 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/FlowerDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/FlowerDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/HugeMushroomDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/HugeMushroomDecorator.java
index 03417402b..f4e07a97f 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/HugeMushroomDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/HugeMushroomDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/LilyPadDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/LilyPadDecorator.java
index 6dcf48867..7d6138048 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/LilyPadDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/LilyPadDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/MushroomDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/MushroomDecorator.java
index 515f1f59d..742192ab8 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/MushroomDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/MushroomDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/PumpkinDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/PumpkinDecorator.java
index 57a43e3a6..c6788c636 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/PumpkinDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/PumpkinDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SandAndClayDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SandAndClayDecorator.java
index 154ca0705..ea65477dc 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SandAndClayDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SandAndClayDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SugarCaneDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SugarCaneDecorator.java
index 43003d4a5..183a27979 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SugarCaneDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/SugarCaneDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TallGrassDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TallGrassDecorator.java
index e74d36f2b..3f952c324 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TallGrassDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TallGrassDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TreeDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TreeDecorator.java
index 19e189619..551404f0d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TreeDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/TreeDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/VineDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/VineDecorator.java
index ba9b1c1da..9f006cc1e 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/VineDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/VineDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/WellDecorator.java b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/WellDecorator.java
index b1d2d5374..afbde6da5 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/decorator/WellDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/decorator/WellDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/BlockPatchObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/BlockPatchObject.java
index cb7b969d4..ac9470aab 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/BlockPatchObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/BlockPatchObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/DungeonObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/DungeonObject.java
index bbc123146..ec0956865 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/DungeonObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/DungeonObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/LootChestObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/LootChestObject.java
index 7f94fd37d..a0d765991 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/LootChestObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/LootChestObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/OreObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/OreObject.java
index 17aac26d1..b6e6b0e3c 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/OreObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/OreObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/PondObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/PondObject.java
index b6accb193..67f38a5b4 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/PondObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/PondObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/SnowObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/SnowObject.java
index 1be4d2947..6ca6e37e3 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/SnowObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/SnowObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/WellObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/WellObject.java
index 9520d965b..1d026ed65 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/WellObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/WellObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/CactusStackObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/CactusStackObject.java
index 79dac6adb..127dd58c2 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/CactusStackObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/CactusStackObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.largeplant;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/HugeMushroomObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/HugeMushroomObject.java
index 73451011b..46b5b9b9e 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/HugeMushroomObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/HugeMushroomObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.largeplant;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/SugarCaneStackObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/SugarCaneStackObject.java
index f51bdc582..107d213ce 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/SugarCaneStackObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/largeplant/SugarCaneStackObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.largeplant;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/BigTreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/BigTreeObject.java
index 97adf9eaa..5e269aace 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/BigTreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/BigTreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/HugeTreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/HugeTreeObject.java
index 3427ec9e1..fe5795fce 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/HugeTreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/HugeTreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/PineTreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/PineTreeObject.java
index 984e02b6d..c974bef08 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/PineTreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/PineTreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/ShrubObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/ShrubObject.java
index 8ef9c3864..45505e213 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/ShrubObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/ShrubObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SmallTreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SmallTreeObject.java
index 158d3bddd..b05de25e5 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SmallTreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SmallTreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SpruceTreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SpruceTreeObject.java
index f9a8bc125..5ef130823 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SpruceTreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SpruceTreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SwampTreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SwampTreeObject.java
index 90b43bd2b..8a838f642 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SwampTreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/SwampTreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/TreeObject.java b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/TreeObject.java
index 2bb88bdff..3b9d3e3aa 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/TreeObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/object/tree/TreeObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.object.tree;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/CavePopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/CavePopulator.java
index 3b150a9a6..0ab0a4778 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/CavePopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/CavePopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/DungeonPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/DungeonPopulator.java
index dd987f009..c8c54d2b1 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/DungeonPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/DungeonPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/FallingLiquidPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/FallingLiquidPopulator.java
index 1d17c7df3..43c6e2774 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/FallingLiquidPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/FallingLiquidPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/GroundCoverPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/GroundCoverPopulator.java
index 06f8a5e57..0f9b4f00a 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/GroundCoverPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/GroundCoverPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/MineshaftPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/MineshaftPopulator.java
index 9180e4c88..b1732bfe7 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/MineshaftPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/MineshaftPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/OrePopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/OrePopulator.java
index 76a06ea71..0b1f63258 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/OrePopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/OrePopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/OverlapingPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/OverlapingPopulator.java
index 23c1d8cbc..54baacd48 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/OverlapingPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/OverlapingPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/PondPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/PondPopulator.java
index 3027ffeac..0b70a3587 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/PondPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/PondPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/RavinePopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/RavinePopulator.java
index 134434828..b455695c5 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/RavinePopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/RavinePopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/RockyShieldPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/RockyShieldPopulator.java
index 72143af20..83a8f7847 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/RockyShieldPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/RockyShieldPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/SnowPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/SnowPopulator.java
index 9510ff31f..94148e601 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/SnowPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/SnowPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/StrongholdPopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/StrongholdPopulator.java
index 17b1d816f..87ab844bd 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/StrongholdPopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/StrongholdPopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/normal/populator/TemplePopulator.java b/src/main/java/org/spout/vanilla/world/generator/normal/populator/TemplePopulator.java
index f9143f04c..b217763a7 100644
--- a/src/main/java/org/spout/vanilla/world/generator/normal/populator/TemplePopulator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/normal/populator/TemplePopulator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.normal.populator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/object/LargePlantObject.java b/src/main/java/org/spout/vanilla/world/generator/object/LargePlantObject.java
index 584c42edc..8627190dc 100644
--- a/src/main/java/org/spout/vanilla/world/generator/object/LargePlantObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/object/LargePlantObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/object/RandomObject.java b/src/main/java/org/spout/vanilla/world/generator/object/RandomObject.java
index 1d6604a8e..6ffd140d8 100644
--- a/src/main/java/org/spout/vanilla/world/generator/object/RandomObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/object/RandomObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/object/RandomizableObject.java b/src/main/java/org/spout/vanilla/world/generator/object/RandomizableObject.java
index bc43771e2..0ee888722 100644
--- a/src/main/java/org/spout/vanilla/world/generator/object/RandomizableObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/object/RandomizableObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/object/RotatableObject.java b/src/main/java/org/spout/vanilla/world/generator/object/RotatableObject.java
index eedca6f21..247d4d6bb 100644
--- a/src/main/java/org/spout/vanilla/world/generator/object/RotatableObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/object/RotatableObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/object/VanillaObjects.java b/src/main/java/org/spout/vanilla/world/generator/object/VanillaObjects.java
index cfb516735..ddab0fe0b 100644
--- a/src/main/java/org/spout/vanilla/world/generator/object/VanillaObjects.java
+++ b/src/main/java/org/spout/vanilla/world/generator/object/VanillaObjects.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.object;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialLayout.java b/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialLayout.java
index 5f2d6d88c..df347806e 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialLayout.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialLayout.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialPicker.java b/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialPicker.java
index dbf97fa2a..d5f5267cd 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialPicker.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/BlockMaterialPicker.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentCuboidPart.java b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentCuboidPart.java
index 90e6efe96..40e301e77 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentCuboidPart.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentCuboidPart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentLayoutPainterPart.java b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentLayoutPainterPart.java
index b85003e30..a2be1cf5c 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentLayoutPainterPart.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentLayoutPainterPart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPart.java b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPart.java
index 91a350803..32bc87276 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPart.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPlanePart.java b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPlanePart.java
index 8b05f7cae..19c7bf4b0 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPlanePart.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/ComponentPlanePart.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/SimpleBlockMaterialPicker.java b/src/main/java/org/spout/vanilla/world/generator/structure/SimpleBlockMaterialPicker.java
index df5da8e2c..94e564067 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/SimpleBlockMaterialPicker.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/SimpleBlockMaterialPicker.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/Structure.java b/src/main/java/org/spout/vanilla/world/generator/structure/Structure.java
index a4a335c4a..b3d1d99d4 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/Structure.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/Structure.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/StructureComponent.java b/src/main/java/org/spout/vanilla/world/generator/structure/StructureComponent.java
index 385e04d31..4d2ba53b1 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/StructureComponent.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/StructureComponent.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/Mineshaft.java b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/Mineshaft.java
index 5776af705..2f42248ac 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/Mineshaft.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/Mineshaft.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.mineshaft;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftCorridor.java b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftCorridor.java
index e1168ace2..b26b84d30 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftCorridor.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftCorridor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.mineshaft;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftIntersection.java b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftIntersection.java
index 266b70e8a..00eb6d0a4 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftIntersection.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftIntersection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.mineshaft;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftRoom.java b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftRoom.java
index 52f54dde8..964a24c0c 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftRoom.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftRoom.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.mineshaft;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftStaircase.java b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftStaircase.java
index aead74fa3..cfd15d1a8 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftStaircase.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/mineshaft/MineshaftStaircase.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.mineshaft;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/Stronghold.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/Stronghold.java
index 127739a50..08b973b20 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/Stronghold.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/Stronghold.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdBlockMaterialPicker.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdBlockMaterialPicker.java
index 0ff6a7a0a..c2c718964 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdBlockMaterialPicker.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdBlockMaterialPicker.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdChestCorridor.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdChestCorridor.java
index 3573ddf24..9c265313d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdChestCorridor.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdChestCorridor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdCorridor.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdCorridor.java
index f37860411..769993567 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdCorridor.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdCorridor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdDoor.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdDoor.java
index be598f0fd..a86733769 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdDoor.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdDoor.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdIntersection.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdIntersection.java
index 38c3ff8aa..d005795ba 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdIntersection.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdIntersection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLargeIntersection.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLargeIntersection.java
index 0ec552429..d92543457 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLargeIntersection.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLargeIntersection.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLibrary.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLibrary.java
index beaa5fd14..25c53eddf 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLibrary.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdLibrary.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPortalRoom.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPortalRoom.java
index a5c1333dc..9d1845c90 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPortalRoom.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPortalRoom.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPrison.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPrison.java
index 1be252ae9..d903cacdf 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPrison.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdPrison.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdRoom.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdRoom.java
index c94e444c9..b742d7fad 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdRoom.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdRoom.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdSpiralStaircase.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdSpiralStaircase.java
index 9b1673d51..6a7459014 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdSpiralStaircase.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdSpiralStaircase.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdStaircase.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdStaircase.java
index 08087af25..54e061c47 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdStaircase.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdStaircase.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdTurn.java b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdTurn.java
index cde8cb9bb..b4981d985 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdTurn.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/stronghold/StrongholdTurn.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.stronghold;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/temple/DesertTemple.java b/src/main/java/org/spout/vanilla/world/generator/structure/temple/DesertTemple.java
index aa3c07f21..3e0299cb4 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/temple/DesertTemple.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/temple/DesertTemple.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.temple;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTemple.java b/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTemple.java
index 1db29494c..3c41d3000 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTemple.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTemple.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.temple;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTempleBlockMaterialPicker.java b/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTempleBlockMaterialPicker.java
index 8a039699a..e889339d4 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTempleBlockMaterialPicker.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/temple/JungleTempleBlockMaterialPicker.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.temple;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/structure/temple/Temple.java b/src/main/java/org/spout/vanilla/world/generator/structure/temple/Temple.java
index 63bc8c55f..51474245d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/structure/temple/Temple.java
+++ b/src/main/java/org/spout/vanilla/world/generator/structure/temple/Temple.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.structure.temple;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/theend/TheEndGenerator.java b/src/main/java/org/spout/vanilla/world/generator/theend/TheEndGenerator.java
index f3539012a..fd6ee93a6 100644
--- a/src/main/java/org/spout/vanilla/world/generator/theend/TheEndGenerator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/theend/TheEndGenerator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.theend;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/theend/biome/EndStoneBiome.java b/src/main/java/org/spout/vanilla/world/generator/theend/biome/EndStoneBiome.java
index 506dffa34..b49358837 100644
--- a/src/main/java/org/spout/vanilla/world/generator/theend/biome/EndStoneBiome.java
+++ b/src/main/java/org/spout/vanilla/world/generator/theend/biome/EndStoneBiome.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.theend.biome;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/theend/decorator/SpireDecorator.java b/src/main/java/org/spout/vanilla/world/generator/theend/decorator/SpireDecorator.java
index acf5a40be..b174ad8bb 100644
--- a/src/main/java/org/spout/vanilla/world/generator/theend/decorator/SpireDecorator.java
+++ b/src/main/java/org/spout/vanilla/world/generator/theend/decorator/SpireDecorator.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.theend.decorator;
 
diff --git a/src/main/java/org/spout/vanilla/world/generator/theend/object/SpireObject.java b/src/main/java/org/spout/vanilla/world/generator/theend/object/SpireObject.java
index 9405397b0..cd1252b0d 100644
--- a/src/main/java/org/spout/vanilla/world/generator/theend/object/SpireObject.java
+++ b/src/main/java/org/spout/vanilla/world/generator/theend/object/SpireObject.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.world.generator.theend.object;
 
diff --git a/src/main/resources/achievement/bg.png b/src/main/resources/achievement/bg.png
new file mode 100644
index 000000000..9cda9620f
Binary files /dev/null and b/src/main/resources/achievement/bg.png differ
diff --git a/src/main/resources/achievement/icons.png b/src/main/resources/achievement/icons.png
new file mode 100644
index 000000000..62354c7c8
Binary files /dev/null and b/src/main/resources/achievement/icons.png differ
diff --git a/src/main/resources/resources/achievement/map.txt b/src/main/resources/achievement/map.txt
similarity index 100%
rename from src/main/resources/resources/achievement/map.txt
rename to src/main/resources/achievement/map.txt
diff --git a/src/main/resources/armor/chain_1.png b/src/main/resources/armor/chain_1.png
new file mode 100644
index 000000000..297e606bf
Binary files /dev/null and b/src/main/resources/armor/chain_1.png differ
diff --git a/src/main/resources/armor/chain_2.png b/src/main/resources/armor/chain_2.png
new file mode 100644
index 000000000..f53c88b88
Binary files /dev/null and b/src/main/resources/armor/chain_2.png differ
diff --git a/src/main/resources/armor/cloth_1.png b/src/main/resources/armor/cloth_1.png
new file mode 100644
index 000000000..567dde622
Binary files /dev/null and b/src/main/resources/armor/cloth_1.png differ
diff --git a/src/main/resources/armor/cloth_2.png b/src/main/resources/armor/cloth_2.png
new file mode 100644
index 000000000..8203bd970
Binary files /dev/null and b/src/main/resources/armor/cloth_2.png differ
diff --git a/src/main/resources/armor/diamond_1.png b/src/main/resources/armor/diamond_1.png
new file mode 100644
index 000000000..46140e70f
Binary files /dev/null and b/src/main/resources/armor/diamond_1.png differ
diff --git a/src/main/resources/armor/diamond_2.png b/src/main/resources/armor/diamond_2.png
new file mode 100644
index 000000000..1b30724ae
Binary files /dev/null and b/src/main/resources/armor/diamond_2.png differ
diff --git a/src/main/resources/armor/gold_1.png b/src/main/resources/armor/gold_1.png
new file mode 100644
index 000000000..ac59da891
Binary files /dev/null and b/src/main/resources/armor/gold_1.png differ
diff --git a/src/main/resources/armor/gold_2.png b/src/main/resources/armor/gold_2.png
new file mode 100644
index 000000000..111d7a541
Binary files /dev/null and b/src/main/resources/armor/gold_2.png differ
diff --git a/src/main/resources/armor/iron_1.png b/src/main/resources/armor/iron_1.png
new file mode 100644
index 000000000..528a9d088
Binary files /dev/null and b/src/main/resources/armor/iron_1.png differ
diff --git a/src/main/resources/armor/iron_2.png b/src/main/resources/armor/iron_2.png
new file mode 100644
index 000000000..230d0c326
Binary files /dev/null and b/src/main/resources/armor/iron_2.png differ
diff --git a/src/main/resources/armor/power.png b/src/main/resources/armor/power.png
new file mode 100644
index 000000000..398aa0b62
Binary files /dev/null and b/src/main/resources/armor/power.png differ
diff --git a/src/main/resources/art/kz.png b/src/main/resources/art/kz.png
new file mode 100644
index 000000000..1e635d910
Binary files /dev/null and b/src/main/resources/art/kz.png differ
diff --git a/src/main/resources/resources/entities/creeper/creeper.obj b/src/main/resources/entities/creeper/creeper.obj
similarity index 100%
rename from src/main/resources/resources/entities/creeper/creeper.obj
rename to src/main/resources/entities/creeper/creeper.obj
diff --git a/src/main/resources/entities/creeper/creeper.png b/src/main/resources/entities/creeper/creeper.png
new file mode 100644
index 000000000..0e6361618
Binary files /dev/null and b/src/main/resources/entities/creeper/creeper.png differ
diff --git a/src/main/resources/resources/entities/creeper/creeper.sep b/src/main/resources/entities/creeper/creeper.sep
similarity index 75%
rename from src/main/resources/resources/entities/creeper/creeper.sep
rename to src/main/resources/entities/creeper/creeper.sep
index a261c4f46..7ebd58103 100644
--- a/src/main/resources/resources/entities/creeper/creeper.sep
+++ b/src/main/resources/entities/creeper/creeper.sep
@@ -6,4 +6,4 @@ Data:
     Health: 20
     Damages: 1
     Size: 1
-    Model: model://Vanilla/resources/entities/creeper/creeper.spm
\ No newline at end of file
+    Model: model://Vanilla/entities/creeper/creeper.spm
diff --git a/src/main/resources/entities/creeper/creeper.smt b/src/main/resources/entities/creeper/creeper.smt
new file mode 100644
index 000000000..da568f081
--- /dev/null
+++ b/src/main/resources/entities/creeper/creeper.smt
@@ -0,0 +1,5 @@
+Shader: shader://Spout/fallbacks/fallback.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/entities/creeper/creeper.png
+    Color: color(1,1,1,1)
diff --git a/src/main/resources/entities/creeper/creeper.spm b/src/main/resources/entities/creeper/creeper.spm
new file mode 100644
index 000000000..d73699160
--- /dev/null
+++ b/src/main/resources/entities/creeper/creeper.spm
@@ -0,0 +1,2 @@
+Mesh: mesh://Vanilla/entities/creeper/creeper.obj
+Material: material://Vanilla/entities/creeper/creeper.smt
diff --git a/src/main/resources/resources/entities/enderman/enderman.obj b/src/main/resources/entities/enderman/enderman.obj
similarity index 100%
rename from src/main/resources/resources/entities/enderman/enderman.obj
rename to src/main/resources/entities/enderman/enderman.obj
diff --git a/src/main/resources/entities/enderman/enderman.png b/src/main/resources/entities/enderman/enderman.png
new file mode 100644
index 000000000..3703b01f3
Binary files /dev/null and b/src/main/resources/entities/enderman/enderman.png differ
diff --git a/src/main/resources/resources/entities/enderman/enderman.sep b/src/main/resources/entities/enderman/enderman.sep
similarity index 74%
rename from src/main/resources/resources/entities/enderman/enderman.sep
rename to src/main/resources/entities/enderman/enderman.sep
index 26ef31095..a1e1f5000 100644
--- a/src/main/resources/resources/entities/enderman/enderman.sep
+++ b/src/main/resources/entities/enderman/enderman.sep
@@ -6,4 +6,4 @@ Data:
     Health: 20
     Damages: 1
     Size: 3
-    Model: model://Vanilla/resources/entities/enderman/enderman.spm
\ No newline at end of file
+    Model: model://Vanilla/entities/enderman/enderman.spm
diff --git a/src/main/resources/entities/enderman/enderman.smt b/src/main/resources/entities/enderman/enderman.smt
new file mode 100644
index 000000000..862d2516a
--- /dev/null
+++ b/src/main/resources/entities/enderman/enderman.smt
@@ -0,0 +1,5 @@
+Shader: shader://Spout/fallbacks/fallback.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/entities/enderman/enderman.png
+    Color: color(1,1,1,1)
diff --git a/src/main/resources/entities/enderman/enderman.spm b/src/main/resources/entities/enderman/enderman.spm
new file mode 100644
index 000000000..e984ab677
--- /dev/null
+++ b/src/main/resources/entities/enderman/enderman.spm
@@ -0,0 +1,2 @@
+Mesh: mesh://Vanilla/entities/enderman/enderman.obj
+Material: material://Vanilla/entities/enderman/enderman.smt
diff --git a/src/main/resources/entities/enderman/enderman_eyes.png b/src/main/resources/entities/enderman/enderman_eyes.png
new file mode 100644
index 000000000..f7926c4dd
Binary files /dev/null and b/src/main/resources/entities/enderman/enderman_eyes.png differ
diff --git a/src/main/resources/resources/entities/human/human.obj b/src/main/resources/entities/human/human.obj
similarity index 100%
rename from src/main/resources/resources/entities/human/human.obj
rename to src/main/resources/entities/human/human.obj
diff --git a/src/main/resources/entities/human/human.png b/src/main/resources/entities/human/human.png
new file mode 100644
index 000000000..a983d084d
Binary files /dev/null and b/src/main/resources/entities/human/human.png differ
diff --git a/src/main/resources/resources/entities/human/human.sep b/src/main/resources/entities/human/human.sep
similarity index 80%
rename from src/main/resources/resources/entities/human/human.sep
rename to src/main/resources/entities/human/human.sep
index 2ff483e33..b9b6ac4d2 100644
--- a/src/main/resources/resources/entities/human/human.sep
+++ b/src/main/resources/entities/human/human.sep
@@ -7,4 +7,4 @@ Data:
     Health: 20
     Damages: 1
     Size: 1
-    Model: model://Vanilla/resources/entities/human/human.spm
\ No newline at end of file
+    Model: model://Vanilla/entities/human/human.spm
diff --git a/src/main/resources/entities/human/human.smt b/src/main/resources/entities/human/human.smt
new file mode 100644
index 000000000..a95f57375
--- /dev/null
+++ b/src/main/resources/entities/human/human.smt
@@ -0,0 +1,5 @@
+Shader: shader://Spout/fallbacks/fallback.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/entities/human/human.png
+    Color: color(1,1,1,1)
diff --git a/src/main/resources/entities/human/human.spm b/src/main/resources/entities/human/human.spm
new file mode 100644
index 000000000..429c4ab6e
--- /dev/null
+++ b/src/main/resources/entities/human/human.spm
@@ -0,0 +1,2 @@
+Mesh: mesh://Vanilla/entities/human/human.obj
+Material: material://Vanilla/entities/human/human.smt
diff --git a/src/main/resources/entities/pigzombie/pigzombie.png b/src/main/resources/entities/pigzombie/pigzombie.png
new file mode 100644
index 000000000..88662d772
Binary files /dev/null and b/src/main/resources/entities/pigzombie/pigzombie.png differ
diff --git a/src/main/resources/resources/entities/pigzombie/zombie.obj b/src/main/resources/entities/pigzombie/zombie.obj
similarity index 100%
rename from src/main/resources/resources/entities/pigzombie/zombie.obj
rename to src/main/resources/entities/pigzombie/zombie.obj
diff --git a/src/main/resources/resources/entities/skeleton/skeleton.obj b/src/main/resources/entities/skeleton/skeleton.obj
similarity index 100%
rename from src/main/resources/resources/entities/skeleton/skeleton.obj
rename to src/main/resources/entities/skeleton/skeleton.obj
diff --git a/src/main/resources/entities/skeleton/skeleton.png b/src/main/resources/entities/skeleton/skeleton.png
new file mode 100644
index 000000000..ec04f8d9b
Binary files /dev/null and b/src/main/resources/entities/skeleton/skeleton.png differ
diff --git a/src/main/resources/resources/entities/skeleton/skeleton.sep b/src/main/resources/entities/skeleton/skeleton.sep
similarity index 74%
rename from src/main/resources/resources/entities/skeleton/skeleton.sep
rename to src/main/resources/entities/skeleton/skeleton.sep
index 964606ac4..0522010d0 100644
--- a/src/main/resources/resources/entities/skeleton/skeleton.sep
+++ b/src/main/resources/entities/skeleton/skeleton.sep
@@ -6,4 +6,4 @@ Data:
     Health: 20
     Damages: 1
     Size: 3
-    Model: model://Vanilla/resources/entities/skeleton/skeleton.spm
\ No newline at end of file
+    Model: model://Vanilla/entities/skeleton/skeleton.spm
diff --git a/src/main/resources/entities/skeleton/skeleton.smt b/src/main/resources/entities/skeleton/skeleton.smt
new file mode 100644
index 000000000..178359882
--- /dev/null
+++ b/src/main/resources/entities/skeleton/skeleton.smt
@@ -0,0 +1,5 @@
+Shader: shader://Spout/fallbacks/fallback.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/entities/skeleton/skeleton.png
+    Color: color(1,1,1,1)
diff --git a/src/main/resources/entities/skeleton/skeleton.spm b/src/main/resources/entities/skeleton/skeleton.spm
new file mode 100644
index 000000000..8e72d8c3d
--- /dev/null
+++ b/src/main/resources/entities/skeleton/skeleton.spm
@@ -0,0 +1,2 @@
+Mesh: mesh://Vanilla/entities/skeleton/skeleton.obj
+Material: material://Vanilla/entities/skeleton/skeleton.smt
diff --git a/src/main/resources/resources/entities/zombie/zombie.obj b/src/main/resources/entities/zombie/zombie.obj
similarity index 100%
rename from src/main/resources/resources/entities/zombie/zombie.obj
rename to src/main/resources/entities/zombie/zombie.obj
diff --git a/src/main/resources/entities/zombie/zombie.png b/src/main/resources/entities/zombie/zombie.png
new file mode 100644
index 000000000..a3dfbf5b6
Binary files /dev/null and b/src/main/resources/entities/zombie/zombie.png differ
diff --git a/src/main/resources/resources/entities/zombie/zombie.sep b/src/main/resources/entities/zombie/zombie.sep
similarity index 75%
rename from src/main/resources/resources/entities/zombie/zombie.sep
rename to src/main/resources/entities/zombie/zombie.sep
index ad1a2a521..86e382669 100644
--- a/src/main/resources/resources/entities/zombie/zombie.sep
+++ b/src/main/resources/entities/zombie/zombie.sep
@@ -6,4 +6,4 @@ Data:
     Health: 20
     Damages: 1
     Size: 1
-    Model: model://Vanilla/resources/entities/zombie/zombie.spm
\ No newline at end of file
+    Model: model://Vanilla/entities/zombie/zombie.spm
diff --git a/src/main/resources/entities/zombie/zombie.smt b/src/main/resources/entities/zombie/zombie.smt
new file mode 100644
index 000000000..a609b7a11
--- /dev/null
+++ b/src/main/resources/entities/zombie/zombie.smt
@@ -0,0 +1,5 @@
+Shader: shader://Spout/fallbacks/fallback.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/entities/zombie/zombie.png
+    Color: color(1,1,1,1)
diff --git a/src/main/resources/resources/entities/zombie/zombie.spm b/src/main/resources/entities/zombie/zombie.spm
similarity index 96%
rename from src/main/resources/resources/entities/zombie/zombie.spm
rename to src/main/resources/entities/zombie/zombie.spm
index 887b44581..637f6b86c 100644
--- a/src/main/resources/resources/entities/zombie/zombie.spm
+++ b/src/main/resources/entities/zombie/zombie.spm
@@ -1,3 +1,2 @@
 Mesh: mesh://Vanilla/resources/entities/zombie/zombie.obj
 Material: material://Vanilla/resources/entities/zombie/zombie.smt
-    
\ No newline at end of file
diff --git a/src/main/resources/environment/clouds.png b/src/main/resources/environment/clouds.png
new file mode 100644
index 000000000..02c868a34
Binary files /dev/null and b/src/main/resources/environment/clouds.png differ
diff --git a/src/main/resources/environment/light_normal.png b/src/main/resources/environment/light_normal.png
new file mode 100644
index 000000000..efdf38de1
Binary files /dev/null and b/src/main/resources/environment/light_normal.png differ
diff --git a/src/main/resources/environment/rain.png b/src/main/resources/environment/rain.png
new file mode 100644
index 000000000..795658eed
Binary files /dev/null and b/src/main/resources/environment/rain.png differ
diff --git a/src/main/resources/environment/snow.png b/src/main/resources/environment/snow.png
new file mode 100644
index 000000000..6f304cc8c
Binary files /dev/null and b/src/main/resources/environment/snow.png differ
diff --git a/src/main/resources/gui/alchemy.png b/src/main/resources/gui/alchemy.png
new file mode 100644
index 000000000..d0f88ab35
Binary files /dev/null and b/src/main/resources/gui/alchemy.png differ
diff --git a/src/main/resources/gui/allitems.png b/src/main/resources/gui/allitems.png
new file mode 100644
index 000000000..eca3278ea
Binary files /dev/null and b/src/main/resources/gui/allitems.png differ
diff --git a/src/main/resources/gui/background.png b/src/main/resources/gui/background.png
new file mode 100644
index 000000000..acad917f4
Binary files /dev/null and b/src/main/resources/gui/background.png differ
diff --git a/src/main/resources/gui/container.png b/src/main/resources/gui/container.png
new file mode 100644
index 000000000..d7e8733c3
Binary files /dev/null and b/src/main/resources/gui/container.png differ
diff --git a/src/main/resources/gui/crafting.png b/src/main/resources/gui/crafting.png
new file mode 100644
index 000000000..4af903876
Binary files /dev/null and b/src/main/resources/gui/crafting.png differ
diff --git a/src/main/resources/gui/enchant.png b/src/main/resources/gui/enchant.png
new file mode 100644
index 000000000..6174ff612
Binary files /dev/null and b/src/main/resources/gui/enchant.png differ
diff --git a/src/main/resources/gui/furnace.png b/src/main/resources/gui/furnace.png
new file mode 100644
index 000000000..35cd04843
Binary files /dev/null and b/src/main/resources/gui/furnace.png differ
diff --git a/src/main/resources/gui/hotbar.png b/src/main/resources/gui/hotbar.png
new file mode 100644
index 000000000..9057c7343
Binary files /dev/null and b/src/main/resources/gui/hotbar.png differ
diff --git a/src/main/resources/gui/icons.png b/src/main/resources/gui/icons.png
new file mode 100644
index 000000000..10e1b9134
Binary files /dev/null and b/src/main/resources/gui/icons.png differ
diff --git a/src/main/resources/gui/inventory.png b/src/main/resources/gui/inventory.png
new file mode 100644
index 000000000..933a28ffd
Binary files /dev/null and b/src/main/resources/gui/inventory.png differ
diff --git a/src/main/resources/gui/items.png b/src/main/resources/gui/items.png
new file mode 100644
index 000000000..f8fdd048d
Binary files /dev/null and b/src/main/resources/gui/items.png differ
diff --git a/src/main/resources/gui/particles.png b/src/main/resources/gui/particles.png
new file mode 100644
index 000000000..afbc5d0c3
Binary files /dev/null and b/src/main/resources/gui/particles.png differ
diff --git a/src/main/resources/gui/slot.png b/src/main/resources/gui/slot.png
new file mode 100644
index 000000000..2d6dda95d
Binary files /dev/null and b/src/main/resources/gui/slot.png differ
diff --git a/src/main/resources/resources/gui/smt/AlchemyGUIMaterial.smt b/src/main/resources/gui/smt/AlchemyGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/AlchemyGUIMaterial.smt
rename to src/main/resources/gui/smt/AlchemyGUIMaterial.smt
index fd1990e96..848896d33 100644
--- a/src/main/resources/resources/gui/smt/AlchemyGUIMaterial.smt
+++ b/src/main/resources/gui/smt/AlchemyGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/alchemy.png
+    Diffuse: texture://Vanilla/gui/alchemy.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/AllitemsGUIMaterial.smt b/src/main/resources/gui/smt/AllitemsGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/AllitemsGUIMaterial.smt
rename to src/main/resources/gui/smt/AllitemsGUIMaterial.smt
index 9ec0ce0b7..eedbfe782 100644
--- a/src/main/resources/resources/gui/smt/AllitemsGUIMaterial.smt
+++ b/src/main/resources/gui/smt/AllitemsGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/allitems.png
+    Diffuse: texture://Vanilla/gui/allitems.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/BackgroundGUIMaterial.smt b/src/main/resources/gui/smt/BackgroundGUIMaterial.smt
similarity index 75%
rename from src/main/resources/resources/gui/smt/BackgroundGUIMaterial.smt
rename to src/main/resources/gui/smt/BackgroundGUIMaterial.smt
index bb539f0e2..02f9100e2 100644
--- a/src/main/resources/resources/gui/smt/BackgroundGUIMaterial.smt
+++ b/src/main/resources/gui/smt/BackgroundGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/background.png
+    Diffuse: texture://Vanilla/gui/background.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/ContainerGUIMaterial.smt b/src/main/resources/gui/smt/ContainerGUIMaterial.smt
similarity index 75%
rename from src/main/resources/resources/gui/smt/ContainerGUIMaterial.smt
rename to src/main/resources/gui/smt/ContainerGUIMaterial.smt
index dff697d91..ea788e443 100644
--- a/src/main/resources/resources/gui/smt/ContainerGUIMaterial.smt
+++ b/src/main/resources/gui/smt/ContainerGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/container.png
+    Diffuse: texture://Vanilla/gui/container.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/CraftingGUIMaterial.smt b/src/main/resources/gui/smt/CraftingGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/CraftingGUIMaterial.smt
rename to src/main/resources/gui/smt/CraftingGUIMaterial.smt
index 6eb876a1f..8bc8d8957 100644
--- a/src/main/resources/resources/gui/smt/CraftingGUIMaterial.smt
+++ b/src/main/resources/gui/smt/CraftingGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/crafting.png
+    Diffuse: texture://Vanilla/gui/crafting.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/EnchantGUIMaterial.smt b/src/main/resources/gui/smt/EnchantGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/EnchantGUIMaterial.smt
rename to src/main/resources/gui/smt/EnchantGUIMaterial.smt
index fea467b88..d7813a6bc 100644
--- a/src/main/resources/resources/gui/smt/EnchantGUIMaterial.smt
+++ b/src/main/resources/gui/smt/EnchantGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/enchant.png
+    Diffuse: texture://Vanilla/gui/enchant.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/FurnaceGUIMaterial.smt b/src/main/resources/gui/smt/FurnaceGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/FurnaceGUIMaterial.smt
rename to src/main/resources/gui/smt/FurnaceGUIMaterial.smt
index 03763ff8c..ab1db0d04 100644
--- a/src/main/resources/resources/gui/smt/FurnaceGUIMaterial.smt
+++ b/src/main/resources/gui/smt/FurnaceGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/furnace.png
+    Diffuse: texture://Vanilla/gui/furnace.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/HotbarGUIMaterial.smt b/src/main/resources/gui/smt/HotbarGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/HotbarGUIMaterial.smt
rename to src/main/resources/gui/smt/HotbarGUIMaterial.smt
index 2a4729d31..a27020515 100644
--- a/src/main/resources/resources/gui/smt/HotbarGUIMaterial.smt
+++ b/src/main/resources/gui/smt/HotbarGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/hotbar.png
+    Diffuse: texture://Vanilla/gui/hotbar.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/IconsGUIMaterial.smt b/src/main/resources/gui/smt/IconsGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/IconsGUIMaterial.smt
rename to src/main/resources/gui/smt/IconsGUIMaterial.smt
index 42a94f403..e131937ef 100644
--- a/src/main/resources/resources/gui/smt/IconsGUIMaterial.smt
+++ b/src/main/resources/gui/smt/IconsGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/icons.png
+    Diffuse: texture://Vanilla/gui/icons.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/InventoryGUIMaterial.smt b/src/main/resources/gui/smt/InventoryGUIMaterial.smt
similarity index 75%
rename from src/main/resources/resources/gui/smt/InventoryGUIMaterial.smt
rename to src/main/resources/gui/smt/InventoryGUIMaterial.smt
index e83bed1bd..956e94ab8 100644
--- a/src/main/resources/resources/gui/smt/InventoryGUIMaterial.smt
+++ b/src/main/resources/gui/smt/InventoryGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/inventory.png
+    Diffuse: texture://Vanilla/gui/inventory.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/ItemsGUIMaterial.smt b/src/main/resources/gui/smt/ItemsGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/ItemsGUIMaterial.smt
rename to src/main/resources/gui/smt/ItemsGUIMaterial.smt
index 89794310b..fe2c5f3cb 100644
--- a/src/main/resources/resources/gui/smt/ItemsGUIMaterial.smt
+++ b/src/main/resources/gui/smt/ItemsGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/items.png
+    Diffuse: texture://Vanilla/gui/items.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/ParticlesGUIMaterial.smt b/src/main/resources/gui/smt/ParticlesGUIMaterial.smt
similarity index 75%
rename from src/main/resources/resources/gui/smt/ParticlesGUIMaterial.smt
rename to src/main/resources/gui/smt/ParticlesGUIMaterial.smt
index 7b0a5e106..95db5ae02 100644
--- a/src/main/resources/resources/gui/smt/ParticlesGUIMaterial.smt
+++ b/src/main/resources/gui/smt/ParticlesGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/particles.png
+    Diffuse: texture://Vanilla/gui/particles.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/SlotGUIMaterial.smt b/src/main/resources/gui/smt/SlotGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/SlotGUIMaterial.smt
rename to src/main/resources/gui/smt/SlotGUIMaterial.smt
index d870dcd93..6c0d61982 100644
--- a/src/main/resources/resources/gui/smt/SlotGUIMaterial.smt
+++ b/src/main/resources/gui/smt/SlotGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/slot.png
+    Diffuse: texture://Vanilla/gui/slot.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/gui/smt/TrapGUIMaterial.smt b/src/main/resources/gui/smt/TrapGUIMaterial.smt
similarity index 76%
rename from src/main/resources/resources/gui/smt/TrapGUIMaterial.smt
rename to src/main/resources/gui/smt/TrapGUIMaterial.smt
index 9a1ce9cf3..696acf4ff 100644
--- a/src/main/resources/resources/gui/smt/TrapGUIMaterial.smt
+++ b/src/main/resources/gui/smt/TrapGUIMaterial.smt
@@ -1,16 +1,16 @@
 # Valid shader descriptor.  Renderer will select the shader version depending on which mode the client is started in
-Shader: shader://Spout/resources/resources/shaders/guiShader.ssf
+Shader: shader://Spout/shaders/guiShader.ssf
 
 RenderState:
-    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True. 
+    # Whether or not to use the Depth Buffer for rendering this material.  Defaults to True.
     Depth: true
-    # View and projection matricies.  Used to override the rendering mode to a static matrix.  
+    # View and projection matricies.  Used to override the rendering mode to a static matrix.
     # null matrix uses Main Camera
     # Defaults to null.
     Projection: null
     View: null
-    
-# Parameters for the Shader.  
+
+# Parameters for the Shader.
 # Accepted Types:
 # - int
 # - float/double
@@ -29,9 +29,8 @@ RenderState:
 #   - texture://PLUGIN/path/to/texture
 #   - supported extensions: gif, png, jpg, bmp
 
-# Names match up to the name in the shader.  
+# Names match up to the name in the shader.
 
 MaterialParams:
-    Diffuse: texture://Vanilla/resources/gui/trap.png
+    Diffuse: texture://Vanilla/gui/trap.png
     BlendColor: color(1,1,1,1)
-    
\ No newline at end of file
diff --git a/src/main/resources/gui/trap.png b/src/main/resources/gui/trap.png
new file mode 100644
index 000000000..dcfd5a87e
Binary files /dev/null and b/src/main/resources/gui/trap.png differ
diff --git a/src/main/resources/item/arrows.png b/src/main/resources/item/arrows.png
new file mode 100644
index 000000000..22ca5e311
Binary files /dev/null and b/src/main/resources/item/arrows.png differ
diff --git a/src/main/resources/item/boat.png b/src/main/resources/item/boat.png
new file mode 100644
index 000000000..00600fb11
Binary files /dev/null and b/src/main/resources/item/boat.png differ
diff --git a/src/main/resources/item/book.png b/src/main/resources/item/book.png
new file mode 100644
index 000000000..a76356fef
Binary files /dev/null and b/src/main/resources/item/book.png differ
diff --git a/src/main/resources/item/cart.png b/src/main/resources/item/cart.png
new file mode 100644
index 000000000..8fbc9ddc5
Binary files /dev/null and b/src/main/resources/item/cart.png differ
diff --git a/src/main/resources/item/chest.png b/src/main/resources/item/chest.png
new file mode 100644
index 000000000..d126efcd0
Binary files /dev/null and b/src/main/resources/item/chest.png differ
diff --git a/src/main/resources/item/door.png b/src/main/resources/item/door.png
new file mode 100644
index 000000000..f73d90574
Binary files /dev/null and b/src/main/resources/item/door.png differ
diff --git a/src/main/resources/item/largechest.png b/src/main/resources/item/largechest.png
new file mode 100644
index 000000000..5e17fd360
Binary files /dev/null and b/src/main/resources/item/largechest.png differ
diff --git a/src/main/resources/item/sign.png b/src/main/resources/item/sign.png
new file mode 100644
index 000000000..b65a50af4
Binary files /dev/null and b/src/main/resources/item/sign.png differ
diff --git a/src/main/resources/item/xporb.png b/src/main/resources/item/xporb.png
new file mode 100644
index 000000000..b1b79de16
Binary files /dev/null and b/src/main/resources/item/xporb.png differ
diff --git a/src/main/resources/jalopy.xml b/src/main/resources/jalopy.xml
deleted file mode 100644
index 0e4073df3..000000000
--- a/src/main/resources/jalopy.xml
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jalopy>
-	<general>
-		<compliance>
-			<version>14</version>
-		</compliance>
-		<style>
-			<description>Spout Coding Convention</description>
-			<name>Spout</name>
-		</style>
-	</general>
-	<inspector>
-		<enable>false</enable>
-		<naming>
-			<classes>
-				<abstract>[A-Z][a-zA-Z0-9]+</abstract>
-				<general>[A-Z][a-zA-Z0-9]+</general>
-			</classes>
-			<fields>
-				<default>[a-z][\w]+</default>
-				<defaultStatic>[a-z][\w]+</defaultStatic>
-				<defaultStaticFinal>[a-zA-Z][\w]+</defaultStaticFinal>
-				<private>[a-z][\w]+</private>
-				<privateStatic>[a-z][\w]+</privateStatic>
-				<privateStaticFinal>[a-zA-Z][\w]+</privateStaticFinal>
-				<protected>[a-z][\w]+</protected>
-				<protectedStatic>[a-z][\w]+</protectedStatic>
-				<protectedStaticFinal>[a-zA-Z][\w]+</protectedStaticFinal>
-				<public>[a-z][\w]+</public>
-				<publicStatic>[a-z][\w]+</publicStatic>
-				<publicStaticFinal>[a-zA-Z][\w]+</publicStaticFinal>
-			</fields>
-			<interfaces>[A-Z][a-zA-Z0-9]+</interfaces>
-			<labels>\w+</labels>
-			<methods>
-				<default>[a-z][\w]+</default>
-				<defaultStatic>[a-z][\w]+</defaultStatic>
-				<defaultStaticFinal>[a-z][\w]+</defaultStaticFinal>
-				<private>[a-z][\w]+</private>
-				<privateStatic>[a-z][\w]+</privateStatic>
-				<privateStaticFinal>[a-z][\w]+</privateStaticFinal>
-				<protected>[a-z][\w]+</protected>
-				<protectedStatic>[a-z][\w]+</protectedStatic>
-				<protectedStaticFinal>[a-z][\w]+</protectedStaticFinal>
-				<public>[a-z][\w]+</public>
-				<publicStatic>[a-z][\w]+</publicStatic>
-				<publicStaticFinal>[a-z][\w]+</publicStaticFinal>
-			</methods>
-			<packages>[a-z]+(?:\.[a-z]+)*</packages>
-			<parameters>
-				<default>[a-z][\w]+</default>
-				<final>[a-z][\w]+</final>
-			</parameters>
-			<variables>[a-z][\w]*</variables>
-		</naming>
-		<tips>
-			<adhereToNamingConvention>false</adhereToNamingConvention>
-			<alwaysOverrideEquals>false</alwaysOverrideEquals>
-			<alwaysOverrideHashCode>false</alwaysOverrideHashCode>
-			<avoidThreadGroups>false</avoidThreadGroups>
-			<declareCollectionComment>false</declareCollectionComment>
-			<dontIgnoreExceptions>false</dontIgnoreExceptions>
-			<dontSubstituteObjectEquals>false</dontSubstituteObjectEquals>
-			<neverDeclareException>false</neverDeclareException>
-			<neverDeclareThrowable>false</neverDeclareThrowable>
-			<neverInvokeWaitOutsideLoop>false</neverInvokeWaitOutsideLoop>
-			<neverReturnZeroArrays>false</neverReturnZeroArrays>
-			<neverUseEmptyFinally>false</neverUseEmptyFinally>
-			<obeyContractEquals>false</obeyContractEquals>
-			<overrideToString>false</overrideToString>
-			<referToObjectsByInterface>false</referToObjectsByInterface>
-			<replaceStructureWithClass>false</replaceStructureWithClass>
-			<stringLiterallI18n>false</stringLiterallI18n>
-			<useInterfaceOnlyForTypes>false</useInterfaceOnlyForTypes>
-			<wrongCollectionComment>false</wrongCollectionComment>
-		</tips>
-	</inspector>
-	<internal>
-		<version>6</version>
-	</internal>
-	<messages>
-		<priority>
-			<general>30000</general>
-			<parser>30000</parser>
-			<parserJavadoc>30000</parserJavadoc>
-			<printer>30000</printer>
-			<printerJavadoc>30000</printerJavadoc>
-			<transform>30000</transform>
-		</priority>
-		<showErrorStackTrace>true</showErrorStackTrace>
-	</messages>
-	<misc>
-		<threadCount>1</threadCount>
-	</misc>
-	<printer>
-		<alignment>
-			<methodCallChain>false</methodCallChain>
-			<parameterMethodDeclaration>false</parameterMethodDeclaration>
-			<ternaryOperator>false</ternaryOperator>
-			<variableAssignment>false</variableAssignment>
-			<variableDeclAssignment>false</variableDeclAssignment>
-			<variableIdentifier>false</variableIdentifier>
-		</alignment>
-		<backup>
-			<directory>bak</directory>
-			<level>0</level>
-		</backup>
-		<blanklines>
-			<after>
-				<block>1</block>
-				<braceLeft>0</braceLeft>
-				<class>1</class>
-				<declaration>1</declaration>
-				<footer>1</footer>
-				<header>0</header>
-				<interface>1</interface>
-				<lastImport>1</lastImport>
-				<method>1</method>
-				<package>1</package>
-			</after>
-			<before>
-				<block>1</block>
-				<braceRight>0</braceRight>
-				<caseBlock>0</caseBlock>
-				<comment>
-					<javadoc>1</javadoc>
-					<multiline>1</multiline>
-					<singleline>1</singleline>
-				</comment>
-				<controlStatement>1</controlStatement>
-				<declaration>1</declaration>
-				<footer>0</footer>
-				<header>0</header>
-			</before>
-			<keepUpTo>1</keepUpTo>
-		</blanklines>
-		<brace>
-			<comment>false</comment>
-		</brace>
-		<braces>
-			<empty>
-				<cuddle>false</cuddle>
-				<insertStatement>false</insertStatement>
-			</empty>
-			<insert>
-				<dowhile>false</dowhile>
-				<for>true</for>
-				<ifelse>false</ifelse>
-				<while>true</while>
-			</insert>
-			<remove>
-				<block>true</block>
-				<dowhile>false</dowhile>
-				<for>false</for>
-				<ifelse>false</ifelse>
-				<while>false</while>
-			</remove>
-			<treatDifferent>
-				<methodClass>false</methodClass>
-				<methodClassIfWrapped>false</methodClassIfWrapped>
-			</treatDifferent>
-		</braces>
-		<chunks>
-			<blanklines>true</blanklines>
-			<comments>true</comments>
-		</chunks>
-		<comments>
-			<format>
-				<multiline>false</multiline>
-			</format>
-			<javadoc>
-				<check>
-					<innerclass>false</innerclass>
-					<tags>false</tags>
-					<throwsTags>true</throwsTags>
-				</check>
-				<fieldsShort>false</fieldsShort>
-				<generate>
-					<class>0</class>
-					<constructor>0</constructor>
-					<field>0</field>
-					<method>0</method>
-				</generate>
-				<parseComments>false</parseComments>
-				<parseDescription>false</parseDescription>
-				<skip>
-					<ifml>false</ifml>
-				</skip>
-				<tags>
-					<in-line/>
-					<standard/>
-				</tags>
-				<templates>
-					<class>/**| * DOCUMENT ME!| */</class>
-					<constructor>
-						<bottom>*/</bottom>
-						<exception>* @throws $exceptionType$ DOCUMENT ME!</exception>
-						<param>* @param $paramType$ DOCUMENT ME!</param>
-						<top>/**| * Creates a new $objectType$ object.</top>
-					</constructor>
-					<interface>/**| * DOCUMENT ME!| */</interface>
-					<method>
-						<bottom>*/</bottom>
-						<exception>* @throws $exceptionType$ DOCUMENT ME!</exception>
-						<param>* @param $paramType$ DOCUMENT ME!</param>
-						<return>* @return DOCUMENT ME!</return>
-						<top>/**| * DOCUMENT ME!</top>
-					</method>
-				</templates>
-			</javadoc>
-			<remove>
-				<javadoc>false</javadoc>
-				<multiline>false</multiline>
-				<singleline>false</singleline>
-			</remove>
-			<separator>
-				<fillCharacter>-</fillCharacter>
-				<insert>false</insert>
-				<insertRecursive>false</insertRecursive>
-				<text>
-					<annotation>Annotations</annotation>
-					<class>Inner Classes</class>
-					<constructor>Constructors</constructor>
-					<enum>Enumerations</enum>
-					<field>Instance fields</field>
-					<initializer>Instance initializers</initializer>
-					<interface>Inner Interfaces</interface>
-					<method>Methods</method>
-					<static>Static fields/initializers</static>
-				</text>
-			</separator>
-		</comments>
-		<environment/>
-		<footer>
-			<ignoreIfExists>false</ignoreIfExists>
-			<keys/>
-			<smartMode>0</smartMode>
-			<use>false</use>
-		</footer>
-		<header>
-			<ignoreIfExists>false</ignoreIfExists>
-			<keys/>
-			<smartMode>0</smartMode>
-			<use>false</use>
-		</header>
-		<history>
-			<method>timestamp</method>
-			<policy>disabled</policy>
-		</history>
-		<imports>
-			<grouping>
-				<defaultDepth>1</defaultDepth>
-				<packages>
-					java:1|javax:1|jline:1|org.jboss.netty:3|com.grahamedgecombe.jterminal:3|net.royawesome.jlibnoise:3|lombok:1|com.mongodb:2|org.jdesktop:2|com.beust.jcommander:3|com.sun.syndication:3|org.apache.commons:3|com.google.common:3|org.xbill.DNS:3|gnu.trove:2|org.yaml:2|org.lwjgl:2|org.newdawn.slick:3|com.pclewis.mcpatcher:3|net.minecraft:2|org.bukkit:2|org.spout:3|org.getspout:3|org.spoutcraft:3|org.hamcrest:2|org.junit:2|*:0
-				</packages>
-				<static>never</static>
-			</grouping>
-			<policy>expand</policy>
-			<sort>true</sort>
-		</imports>
-		<indentation>
-			<caseFromSwitch>true</caseFromSwitch>
-			<continuation>
-				<block>false</block>
-				<operator>false</operator>
-			</continuation>
-			<firstColumnComments>false</firstColumnComments>
-			<label>true</label>
-			<policy>
-				<deep>false</deep>
-			</policy>
-			<sizes>
-				<braceCuddled>1</braceCuddled>
-				<braceLeft>1</braceLeft>
-				<braceRight>0</braceRight>
-				<braceRightAfter>1</braceRightAfter>
-				<continuation>4</continuation>
-				<deep>60</deep>
-				<extends>-1</extends>
-				<general>4</general>
-				<implements>-1</implements>
-				<leading>0</leading>
-				<tabs>8</tabs>
-				<throws>-1</throws>
-				<trailingComment>1</trailingComment>
-			</sizes>
-			<tabs>
-				<enable>true</enable>
-				<onlyLeading>true</onlyLeading>
-			</tabs>
-		</indentation>
-		<misc>
-			<arrayBracketsAfterIdent>false</arrayBracketsAfterIdent>
-			<forceFinalModifier>false</forceFinalModifier>
-			<forceFormatting>true</forceFormatting>
-			<insertExpressionParentheses>true</insertExpressionParentheses>
-			<insertLoggingConditional>false</insertLoggingConditional>
-			<insertTrailingNewline>true</insertTrailingNewline>
-			<insertUID>false</insertUID>
-			<method>
-				<forceFinalModifier>false</forceFinalModifier>
-			</method>
-		</misc>
-		<sorting>
-			<declaration>
-				<annotation>false</annotation>
-				<class>true</class>
-				<constructor>true</constructor>
-				<enable>false</enable>
-				<enum>false</enum>
-				<interface>true</interface>
-				<method>true
-					<bean>false</bean>
-				</method>
-				<order>static|field|initializer|constructor|method|interface|class|annotation|enum</order>
-				<variable>true</variable>
-			</declaration>
-			<modifier>
-				<enable>false</enable>
-				<order>static=true|final=true|public=true|protected=true|private=true|abstract=true|synchronized=true|transient=true|volatile=true|native=true|strictfp=true</order>
-			</modifier>
-		</sorting>
-		<whitespace>
-			<after>
-				<comma>true</comma>
-				<semicolon>true</semicolon>
-				<typeCast>true</typeCast>
-			</after>
-			<before>
-				<braces>true</braces>
-				<brackets>false</brackets>
-				<bracketsTypes>false</bracketsTypes>
-				<caseColon>false</caseColon>
-				<operator>
-					<not>false</not>
-				</operator>
-				<parentheses>
-					<methodCall>false</methodCall>
-					<methodDeclaration>false</methodDeclaration>
-					<statement>true</statement>
-				</parentheses>
-			</before>
-			<padding>
-				<braces>false</braces>
-				<brackets>false</brackets>
-				<operator>
-					<assignment>true</assignment>
-					<bitwise>true</bitwise>
-					<logical>true</logical>
-					<mathematical>true</mathematical>
-					<relational>true</relational>
-					<shift>true</shift>
-				</operator>
-				<parenthesis>false</parenthesis>
-				<typeCast>false</typeCast>
-			</padding>
-		</whitespace>
-		<wrapping>
-			<always>
-				<after>
-					<arrayElement>0</arrayElement>
-					<braceRight>false</braceRight>
-					<extendsTypes>false</extendsTypes>
-					<implementsTypes>false</implementsTypes>
-					<label>true</label>
-					<methodCallChained>false</methodCallChained>
-					<ternaryOperator>
-						<first>false</first>
-						<second>false</second>
-					</ternaryOperator>
-					<throwsTypes>false</throwsTypes>
-				</after>
-				<before>
-					<braceLeft>false</braceLeft>
-					<extends>false</extends>
-					<implements>false</implements>
-					<throws>false</throws>
-				</before>
-				<parameter>
-					<methodCall>false</methodCall>
-					<methodCallNested>false</methodCallNested>
-					<methodDeclaration>false</methodDeclaration>
-				</parameter>
-			</always>
-			<anon>
-				<align>
-					<after>2147483647</after>
-				</align>
-				<lcurly>
-					<newline>true</newline>
-				</lcurly>
-			</anon>
-			<anondef>
-				<align>
-					<after>2147483647</after>
-				</align>
-				<lcurly>
-					<nonewline>true</nonewline>
-				</lcurly>
-			</anondef>
-			<enum>
-				<align>
-					<after>2147483647</after>
-				</align>
-				<lcurly>
-					<nonewline>true</nonewline>
-				</lcurly>
-			</enum>
-			<general>
-				<beforeOperator>false</beforeOperator>
-				<enable>true</enable>
-				<lineLength>200</lineLength>
-			</general>
-			<ondemand>
-				<after>
-					<assignment>false</assignment>
-					<leftParenthesis>false</leftParenthesis>
-					<parameter>false</parameter>
-					<types>
-						<extends>false</extends>
-						<implements>false</implements>
-						<throws>false</throws>
-					</types>
-				</after>
-				<before>
-					<rightParenthesis>false</rightParenthesis>
-				</before>
-				<deep>
-					<parameter>false</parameter>
-				</deep>
-				<groupingParentheses>false</groupingParentheses>
-				<hard>
-					<parameter>false</parameter>
-				</hard>
-			</ondemand>
-		</wrapping>
-	</printer>
-</jalopy>
-
diff --git a/src/main/resources/resources/light.png b/src/main/resources/light.png
similarity index 100%
rename from src/main/resources/resources/light.png
rename to src/main/resources/light.png
diff --git a/src/main/resources/resources/map/mapColorPalette.dat b/src/main/resources/map/mapColorPalette.dat
similarity index 100%
rename from src/main/resources/resources/map/mapColorPalette.dat
rename to src/main/resources/map/mapColorPalette.dat
diff --git a/src/main/resources/materials/block/liquid/lava/lava.spm b/src/main/resources/materials/block/liquid/lava/lava.spm
new file mode 100644
index 000000000..114bee8aa
--- /dev/null
+++ b/src/main/resources/materials/block/liquid/lava/lava.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/liquid/lava/lava.uvs
+Material: material://Vanilla/materials/terrainLiquid.smt
diff --git a/src/main/resources/resources/materials/block/liquid/lava/lava.uvs b/src/main/resources/materials/block/liquid/lava/lava.uvs
similarity index 84%
rename from src/main/resources/resources/materials/block/liquid/lava/lava.uvs
rename to src/main/resources/materials/block/liquid/lava/lava.uvs
index 2076ed3a5..0c3ef416c 100644
--- a/src/main/resources/resources/materials/block/liquid/lava/lava.uvs
+++ b/src/main/resources/materials/block/liquid/lava/lava.uvs
@@ -2,4 +2,4 @@
 # See TextureMeshLoader
 scale 16 16
 size 1 1
-rect 14 14
\ No newline at end of file
+rect 14 14
diff --git a/src/main/resources/materials/block/liquid/water/water.spm b/src/main/resources/materials/block/liquid/water/water.spm
new file mode 100644
index 000000000..fe2cb46e2
--- /dev/null
+++ b/src/main/resources/materials/block/liquid/water/water.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/liquid/water/water.uvs
+Material: material://Vanilla/materials/terrainWater.smt
diff --git a/src/main/resources/resources/materials/block/liquid/water/water.uvs b/src/main/resources/materials/block/liquid/water/water.uvs
similarity index 84%
rename from src/main/resources/resources/materials/block/liquid/water/water.uvs
rename to src/main/resources/materials/block/liquid/water/water.uvs
index 269c9fedd..11fc10aef 100644
--- a/src/main/resources/resources/materials/block/liquid/water/water.uvs
+++ b/src/main/resources/materials/block/liquid/water/water.uvs
@@ -2,4 +2,4 @@
 # See TextureMeshLoader
 scale 16 16
 size 1 1
-rect 14 12
\ No newline at end of file
+rect 14 12
diff --git a/src/main/resources/resources/materials/block/nonsolid/anvil/anvil_EW.obj b/src/main/resources/materials/block/nonsolid/anvil/anvil_EW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/anvil/anvil_EW.obj
rename to src/main/resources/materials/block/nonsolid/anvil/anvil_EW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/anvil/anvil_NS.obj b/src/main/resources/materials/block/nonsolid/anvil/anvil_NS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/anvil/anvil_NS.obj
rename to src/main/resources/materials/block/nonsolid/anvil/anvil_NS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/bed/bed_E.obj b/src/main/resources/materials/block/nonsolid/bed/bed_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/bed/bed_E.obj
rename to src/main/resources/materials/block/nonsolid/bed/bed_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/bed/bed_N.obj b/src/main/resources/materials/block/nonsolid/bed/bed_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/bed/bed_N.obj
rename to src/main/resources/materials/block/nonsolid/bed/bed_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/bed/bed_S.obj b/src/main/resources/materials/block/nonsolid/bed/bed_S.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/bed/bed_S.obj
rename to src/main/resources/materials/block/nonsolid/bed/bed_S.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/bed/bed_W.obj b/src/main/resources/materials/block/nonsolid/bed/bed_W.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/bed/bed_W.obj
rename to src/main/resources/materials/block/nonsolid/bed/bed_W.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj b/src/main/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj
similarity index 97%
rename from src/main/resources/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj
rename to src/main/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj
index 814fd8e57..41129c2c1 100644
--- a/src/main/resources/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj
+++ b/src/main/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj
@@ -25,4 +25,4 @@ f 7/4 8/1 5/2
 f 9/3 10/1 11/2
 f 10/1 9/3 12/4
 f 13/4 14/2 15/3
-f 14/2 13/4 16/1
\ No newline at end of file
+f 14/2 13/4 16/1
diff --git a/src/main/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm b/src/main/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm
new file mode 100644
index 000000000..d63395507
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/brownmushroom/brownmushroom.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/cactus/cactus.obj b/src/main/resources/materials/block/nonsolid/cactus/cactus.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/cactus/cactus.obj
rename to src/main/resources/materials/block/nonsolid/cactus/cactus.obj
diff --git a/src/main/resources/materials/block/nonsolid/cactus/cactus.spm b/src/main/resources/materials/block/nonsolid/cactus/cactus.spm
new file mode 100644
index 000000000..fc3abca1f
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/cactus/cactus.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/cactus/cactus.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/caudron/caudronEmpty.obj b/src/main/resources/materials/block/nonsolid/caudron/caudronEmpty.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/caudron/caudronEmpty.obj
rename to src/main/resources/materials/block/nonsolid/caudron/caudronEmpty.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/caudron/caudronFull1.obj b/src/main/resources/materials/block/nonsolid/caudron/caudronFull1.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/caudron/caudronFull1.obj
rename to src/main/resources/materials/block/nonsolid/caudron/caudronFull1.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/caudron/caudronFull2.obj b/src/main/resources/materials/block/nonsolid/caudron/caudronFull2.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/caudron/caudronFull2.obj
rename to src/main/resources/materials/block/nonsolid/caudron/caudronFull2.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/caudron/caudronFull3.obj b/src/main/resources/materials/block/nonsolid/caudron/caudronFull3.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/caudron/caudronFull3.obj
rename to src/main/resources/materials/block/nonsolid/caudron/caudronFull3.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/dandelion/dandelion.obj b/src/main/resources/materials/block/nonsolid/dandelion/dandelion.obj
similarity index 97%
rename from src/main/resources/resources/materials/block/nonsolid/dandelion/dandelion.obj
rename to src/main/resources/materials/block/nonsolid/dandelion/dandelion.obj
index ab9b89e12..78dde1364 100644
--- a/src/main/resources/resources/materials/block/nonsolid/dandelion/dandelion.obj
+++ b/src/main/resources/materials/block/nonsolid/dandelion/dandelion.obj
@@ -25,4 +25,4 @@ f 7/4 8/1 5/2
 f 9/3 10/1 11/2
 f 10/1 9/3 12/4
 f 13/4 14/2 15/3
-f 14/2 13/4 16/1
\ No newline at end of file
+f 14/2 13/4 16/1
diff --git a/src/main/resources/materials/block/nonsolid/dandelion/dandelion.spm b/src/main/resources/materials/block/nonsolid/dandelion/dandelion.spm
new file mode 100644
index 000000000..eea4e1071
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/dandelion/dandelion.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/dandelion/dandelion.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/deadgrass/deadgrass.obj b/src/main/resources/materials/block/nonsolid/deadgrass/deadgrass.obj
similarity index 97%
rename from src/main/resources/resources/materials/block/nonsolid/deadgrass/deadgrass.obj
rename to src/main/resources/materials/block/nonsolid/deadgrass/deadgrass.obj
index a39969293..6939b726b 100644
--- a/src/main/resources/resources/materials/block/nonsolid/deadgrass/deadgrass.obj
+++ b/src/main/resources/materials/block/nonsolid/deadgrass/deadgrass.obj
@@ -25,4 +25,4 @@ f 7/4 8/1 5/2
 f 9/3 10/1 11/2
 f 10/1 9/3 12/4
 f 13/4 14/2 15/3
-f 14/2 13/4 16/1
\ No newline at end of file
+f 14/2 13/4 16/1
diff --git a/src/main/resources/materials/block/nonsolid/deadgrass/deadgrass.spm b/src/main/resources/materials/block/nonsolid/deadgrass/deadgrass.spm
new file mode 100644
index 000000000..aef6cc286
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/deadgrass/deadgrass.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/deadgrass/deadgrass.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/fern/fern.obj b/src/main/resources/materials/block/nonsolid/fern/fern.obj
similarity index 97%
rename from src/main/resources/resources/materials/block/nonsolid/fern/fern.obj
rename to src/main/resources/materials/block/nonsolid/fern/fern.obj
index 44de08c4f..63d726ae9 100644
--- a/src/main/resources/resources/materials/block/nonsolid/fern/fern.obj
+++ b/src/main/resources/materials/block/nonsolid/fern/fern.obj
@@ -25,4 +25,4 @@ f 7/4 8/1 5/2
 f 9/3 10/1 11/2
 f 10/1 9/3 12/4
 f 13/4 14/2 15/3
-f 14/2 13/4 16/1
\ No newline at end of file
+f 14/2 13/4 16/1
diff --git a/src/main/resources/materials/block/nonsolid/fern/fern.spm b/src/main/resources/materials/block/nonsolid/fern/fern.spm
new file mode 100644
index 000000000..0d8379fa2
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/fern/fern.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/fern/fern.obj
+Material: material://Vanilla/materials/terrainTallGrass.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_E.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_E.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ES.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ES.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ESW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ESW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ESW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_ESW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_EW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_EW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_EW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_EW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_N.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_N.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NE.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NE.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NES.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NES.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NESW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NESW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NESW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NESW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NEW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NEW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NEW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NEW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NS.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NS.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NSW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NSW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NSW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NSW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_S.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_S.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_S.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_S.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_SW.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_SW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_SW.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_SW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_W.obj b/src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_W.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_W.obj
rename to src/main/resources/materials/block/nonsolid/netherbrickfence/netherbrickfence_W.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/redmushroom/redmushroom.obj b/src/main/resources/materials/block/nonsolid/redmushroom/redmushroom.obj
similarity index 97%
rename from src/main/resources/resources/materials/block/nonsolid/redmushroom/redmushroom.obj
rename to src/main/resources/materials/block/nonsolid/redmushroom/redmushroom.obj
index b69c596ec..1d1d7f772 100644
--- a/src/main/resources/resources/materials/block/nonsolid/redmushroom/redmushroom.obj
+++ b/src/main/resources/materials/block/nonsolid/redmushroom/redmushroom.obj
@@ -25,4 +25,4 @@ f 7/4 8/1 5/2
 f 9/3 10/1 11/2
 f 10/1 9/3 12/4
 f 13/4 14/2 15/3
-f 14/2 13/4 16/1
\ No newline at end of file
+f 14/2 13/4 16/1
diff --git a/src/main/resources/materials/block/nonsolid/redmushroom/redmushroom.spm b/src/main/resources/materials/block/nonsolid/redmushroom/redmushroom.spm
new file mode 100644
index 000000000..249e51ab4
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/redmushroom/redmushroom.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/redmushroom/redmushroom.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/rose/rose.obj b/src/main/resources/materials/block/nonsolid/rose/rose.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/rose/rose.obj
rename to src/main/resources/materials/block/nonsolid/rose/rose.obj
diff --git a/src/main/resources/materials/block/nonsolid/rose/rose.spm b/src/main/resources/materials/block/nonsolid/rose/rose.spm
new file mode 100644
index 000000000..d403d37d3
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/rose/rose.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/rose/rose.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_1.obj b/src/main/resources/materials/block/nonsolid/snow/snow_1.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_1.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_1.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_1.spm b/src/main/resources/materials/block/nonsolid/snow/snow_1.spm
new file mode 100644
index 000000000..3654f7386
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_1.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_1.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_2.obj b/src/main/resources/materials/block/nonsolid/snow/snow_2.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_2.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_2.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_2.spm b/src/main/resources/materials/block/nonsolid/snow/snow_2.spm
new file mode 100644
index 000000000..08b4a4cf9
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_2.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_2.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_3.obj b/src/main/resources/materials/block/nonsolid/snow/snow_3.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_3.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_3.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_3.spm b/src/main/resources/materials/block/nonsolid/snow/snow_3.spm
new file mode 100644
index 000000000..af7607a67
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_3.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_3.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_4.obj b/src/main/resources/materials/block/nonsolid/snow/snow_4.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_4.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_4.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_4.spm b/src/main/resources/materials/block/nonsolid/snow/snow_4.spm
new file mode 100644
index 000000000..4091cc9c6
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_4.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_4.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_5.obj b/src/main/resources/materials/block/nonsolid/snow/snow_5.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_5.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_5.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_5.spm b/src/main/resources/materials/block/nonsolid/snow/snow_5.spm
new file mode 100644
index 000000000..6ae9b6a59
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_5.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_5.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_6.obj b/src/main/resources/materials/block/nonsolid/snow/snow_6.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_6.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_6.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_6.spm b/src/main/resources/materials/block/nonsolid/snow/snow_6.spm
new file mode 100644
index 000000000..7fd03d93e
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_6.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_6.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_7.obj b/src/main/resources/materials/block/nonsolid/snow/snow_7.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/snow/snow_7.obj
rename to src/main/resources/materials/block/nonsolid/snow/snow_7.obj
diff --git a/src/main/resources/materials/block/nonsolid/snow/snow_7.spm b/src/main/resources/materials/block/nonsolid/snow/snow_7.spm
new file mode 100644
index 000000000..e4990a9c4
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/snow/snow_7.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/snow/snow_7.obj
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_S.obj
index 6dae94eac..d59f09a07 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_SW.obj
index c730fe699..f8dafe519 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_W.obj
index 352a7de72..10b9c67dc 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/birchwood/birchwoodstair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_S.obj
index fee4d5ed3..9d1b623e2 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_SW.obj
index 8c4e1e3de..5c4f78cb8 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/brick/brickstair_W.obj
index e025314e5..d61c23443 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/brick/brickstair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/brick/brickstair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_E.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_N.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_S.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_S.obj
index 1f257b165..d1dfdfa04 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_SW.obj
index 6e0836297..bc53a8256 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_W.obj b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_W.obj
index 74270280c..90fe47d05 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/cobble/cobblestair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/cobble/cobblestair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_S.obj
index 3aeb5b1b0..6cd6cff17 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_SW.obj
index 5029c01d3..932c30b0e 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_W.obj
index 606edbc8c..6bdc45750 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/junglewood/junglewoodstair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_S.obj
index 8879bea6e..69e6c0f55 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_SW.obj
index 2da6e7de2..b47ba3459 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_W.obj
index 98398b0df..058f5e2c7 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/netherbrick/netherbrickstair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_E.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_N.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_S.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_S.obj
index 9e6bc8bae..0e47ca937 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_SW.obj
index a20960efe..3306d330a 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_W.obj b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_W.obj
index eefe300e1..64caefef4 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/sandstone/sandstonestair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_S.obj
index ec0d83f1a..89e7a481f 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_SW.obj
index 0d16d2f4a..fa61a5043 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_W.obj
index eb4775974..c8b8b8292 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/sprucewood/sprucewoodstair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_S.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_S.obj
index 88d8edcde..2267d45ec 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_S.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_S.obj
@@ -39,4 +39,4 @@ f 1/1 2/6 3/5
 f 3/5 9/3 11/7
 f 1/1 11/7 7/8
 f 4/4 8/8 12/7
-f 4/4 6/6 5/5
\ No newline at end of file
+f 4/4 6/6 5/5
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_SW.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_SW.obj
index b2fdddac5..650da6149 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_SW.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_SW.obj
@@ -44,4 +44,4 @@ f 2/8 4/3 5/7
 f 7/8 8/7 15/3
 f 7/8 15/3 13/6
 f 1/7 3/6 4/8
-f 3/3 5/8 4/7
\ No newline at end of file
+f 3/3 5/8 4/7
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_W.obj
similarity index 98%
rename from src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_W.obj
index 4b5f5beea..6bfed4453 100644
--- a/src/main/resources/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_W.obj
+++ b/src/main/resources/materials/block/nonsolid/stair/stonebrick/stonebrickstair_W.obj
@@ -40,4 +40,4 @@ f 1/8 2/7 3/4
 f 3/4 9/5 11/9
 f 1/8 11/9 7/2
 f 4/1 8/2 12/9
-f 4/1 6/7 5/4
\ No newline at end of file
+f 4/1 6/7 5/4
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_E.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_E.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_ES.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_ES.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IE.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IE.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IES.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IES.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IN.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IN.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IN.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IN.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_INE.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_INE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_INE.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_INE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_INW.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_INW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_INW.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_INW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IS.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IS.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_ISW.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_ISW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_ISW.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_ISW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IW.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_IW.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_IW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_N.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_N.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_NE.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_NE.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_NW.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_NW.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_S.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_S.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_S.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_S.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_SW.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_SW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_SW.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_SW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_W.obj b/src/main/resources/materials/block/nonsolid/stair/wood/woodstair_W.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/stair/wood/woodstair_W.obj
rename to src/main/resources/materials/block/nonsolid/stair/wood/woodstair_W.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/sugarcane/sugarcane.obj b/src/main/resources/materials/block/nonsolid/sugarcane/sugarcane.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/sugarcane/sugarcane.obj
rename to src/main/resources/materials/block/nonsolid/sugarcane/sugarcane.obj
diff --git a/src/main/resources/materials/block/nonsolid/sugarcane/sugarcane.spm b/src/main/resources/materials/block/nonsolid/sugarcane/sugarcane.spm
new file mode 100644
index 000000000..d603fdb69
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/sugarcane/sugarcane.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/sugarcane/sugarcane.obj
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/tallgrass/tallgrass.obj b/src/main/resources/materials/block/nonsolid/tallgrass/tallgrass.obj
similarity index 97%
rename from src/main/resources/resources/materials/block/nonsolid/tallgrass/tallgrass.obj
rename to src/main/resources/materials/block/nonsolid/tallgrass/tallgrass.obj
index 1462f03c3..b6e1ff8fe 100644
--- a/src/main/resources/resources/materials/block/nonsolid/tallgrass/tallgrass.obj
+++ b/src/main/resources/materials/block/nonsolid/tallgrass/tallgrass.obj
@@ -25,4 +25,4 @@ f 7/4 8/1 5/2
 f 9/3 10/1 11/2
 f 10/1 9/3 12/4
 f 13/4 14/2 15/3
-f 14/2 13/4 16/1
\ No newline at end of file
+f 14/2 13/4 16/1
diff --git a/src/main/resources/materials/block/nonsolid/tallgrass/tallgrass.spm b/src/main/resources/materials/block/nonsolid/tallgrass/tallgrass.spm
new file mode 100644
index 000000000..6a7990242
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/tallgrass/tallgrass.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/tallgrass/tallgrass.obj
+Material: material://Vanilla/materials/terrainTallGrass.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/vines/vines.obj b/src/main/resources/materials/block/nonsolid/vines/vines.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/vines/vines.obj
rename to src/main/resources/materials/block/nonsolid/vines/vines.obj
diff --git a/src/main/resources/materials/block/nonsolid/vines/vines.spm b/src/main/resources/materials/block/nonsolid/vines/vines.spm
new file mode 100644
index 000000000..eff13aae9
--- /dev/null
+++ b/src/main/resources/materials/block/nonsolid/vines/vines.spm
@@ -0,0 +1,2 @@
+Mesh: blockmesh://Vanilla/materials/block/nonsolid/vines/vines.obj
+Material: material://Vanilla/materials/terrainFoliage.smt
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_E.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_E.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_E.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_E.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_ES.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_ES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_ES.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_ES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_ESW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_ESW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_ESW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_ESW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_EW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_EW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_EW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_EW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_N.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_N.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_N.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_N.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NE.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NE.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NE.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NE.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NES.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NES.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NES.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NES.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NESW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NESW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NESW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NESW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NEW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NEW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NEW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NEW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NS.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NS.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NS.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NS.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NSW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NSW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NSW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NSW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_NW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_NW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_NW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_S.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_S.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_S.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_S.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_SW.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_SW.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_SW.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_SW.obj
diff --git a/src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_W.obj b/src/main/resources/materials/block/nonsolid/woodenfence/fence_W.obj
similarity index 100%
rename from src/main/resources/resources/materials/block/nonsolid/woodenfence/fence_W.obj
rename to src/main/resources/materials/block/nonsolid/woodenfence/fence_W.obj
diff --git a/src/main/resources/materials/block/solid/bedrock/bedrock.spm b/src/main/resources/materials/block/solid/bedrock/bedrock.spm
new file mode 100644
index 000000000..3022e984f
--- /dev/null
+++ b/src/main/resources/materials/block/solid/bedrock/bedrock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/bedrock/bedrock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/bedrock/bedrock.uvs b/src/main/resources/materials/block/solid/bedrock/bedrock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/bedrock/bedrock.uvs
rename to src/main/resources/materials/block/solid/bedrock/bedrock.uvs
index ba7163469..22ae3d18e 100644
--- a/src/main/resources/resources/materials/block/solid/bedrock/bedrock.uvs
+++ b/src/main/resources/materials/block/solid/bedrock/bedrock.uvs
@@ -7,4 +7,4 @@ rect 1 1
 rect 1 1
 rect 1 1
 rect 1 1
-rect 1 1
\ No newline at end of file
+rect 1 1
diff --git a/src/main/resources/materials/block/solid/birchleaves/birchleaves.spm b/src/main/resources/materials/block/solid/birchleaves/birchleaves.spm
new file mode 100644
index 000000000..c89f5c343
--- /dev/null
+++ b/src/main/resources/materials/block/solid/birchleaves/birchleaves.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/birchleaves/birchleaves.uvs
+Material: material://Vanilla/materials/terrainFoliage.smt
diff --git a/src/main/resources/resources/materials/block/solid/birchleaves/birchleaves.uvs b/src/main/resources/materials/block/solid/birchleaves/birchleaves.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/birchleaves/birchleaves.uvs
rename to src/main/resources/materials/block/solid/birchleaves/birchleaves.uvs
index 71d84aebe..d8f4d5002 100644
--- a/src/main/resources/resources/materials/block/solid/birchleaves/birchleaves.uvs
+++ b/src/main/resources/materials/block/solid/birchleaves/birchleaves.uvs
@@ -7,4 +7,4 @@ rect 4 3
 rect 4 3
 rect 4 3
 rect 4 3
-rect 4 3
\ No newline at end of file
+rect 4 3
diff --git a/src/main/resources/materials/block/solid/birchplanks/birchplanks.spm b/src/main/resources/materials/block/solid/birchplanks/birchplanks.spm
new file mode 100644
index 000000000..d5380b0f7
--- /dev/null
+++ b/src/main/resources/materials/block/solid/birchplanks/birchplanks.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/birchplanks/birchplanks.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/birchplanks/birchplanks.uvs b/src/main/resources/materials/block/solid/birchplanks/birchplanks.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/birchplanks/birchplanks.uvs
rename to src/main/resources/materials/block/solid/birchplanks/birchplanks.uvs
index d063e8f1b..abcdb63cc 100644
--- a/src/main/resources/resources/materials/block/solid/birchplanks/birchplanks.uvs
+++ b/src/main/resources/materials/block/solid/birchplanks/birchplanks.uvs
@@ -7,4 +7,4 @@ rect 6 13
 rect 6 13
 rect 6 13
 rect 6 13
-rect 6 13
\ No newline at end of file
+rect 6 13
diff --git a/src/main/resources/materials/block/solid/birchwood/birchwood.spm b/src/main/resources/materials/block/solid/birchwood/birchwood.spm
new file mode 100644
index 000000000..938ea7bf0
--- /dev/null
+++ b/src/main/resources/materials/block/solid/birchwood/birchwood.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/birchwood/birchwood.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/birchwood/birchwood.uvs b/src/main/resources/materials/block/solid/birchwood/birchwood.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/birchwood/birchwood.uvs
rename to src/main/resources/materials/block/solid/birchwood/birchwood.uvs
index 97b001633..f1f794974 100644
--- a/src/main/resources/resources/materials/block/solid/birchwood/birchwood.uvs
+++ b/src/main/resources/materials/block/solid/birchwood/birchwood.uvs
@@ -7,4 +7,4 @@ rect 5 1
 rect 5 7
 rect 5 7
 rect 5 7
-rect 5 7
\ No newline at end of file
+rect 5 7
diff --git a/src/main/resources/materials/block/solid/blackwool/blackwool.spm b/src/main/resources/materials/block/solid/blackwool/blackwool.spm
new file mode 100644
index 000000000..975c3c918
--- /dev/null
+++ b/src/main/resources/materials/block/solid/blackwool/blackwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/blackwool/blackwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/blackwool/blackwool.uvs b/src/main/resources/materials/block/solid/blackwool/blackwool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/blackwool/blackwool.uvs
rename to src/main/resources/materials/block/solid/blackwool/blackwool.uvs
index 244c714be..6533864a0 100644
--- a/src/main/resources/resources/materials/block/solid/blackwool/blackwool.uvs
+++ b/src/main/resources/materials/block/solid/blackwool/blackwool.uvs
@@ -7,4 +7,4 @@ rect 1 7
 rect 1 7
 rect 1 7
 rect 1 7
-rect 1 7
\ No newline at end of file
+rect 1 7
diff --git a/src/main/resources/materials/block/solid/bluewool/bluewool.spm b/src/main/resources/materials/block/solid/bluewool/bluewool.spm
new file mode 100644
index 000000000..3a49f451b
--- /dev/null
+++ b/src/main/resources/materials/block/solid/bluewool/bluewool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/bluewool/bluewool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/bluewool/bluewool.uvs b/src/main/resources/materials/block/solid/bluewool/bluewool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/bluewool/bluewool.uvs
rename to src/main/resources/materials/block/solid/bluewool/bluewool.uvs
index adb47740e..a915ac23c 100644
--- a/src/main/resources/resources/materials/block/solid/bluewool/bluewool.uvs
+++ b/src/main/resources/materials/block/solid/bluewool/bluewool.uvs
@@ -7,4 +7,4 @@ rect 1 11
 rect 1 11
 rect 1 11
 rect 1 11
-rect 1 11
\ No newline at end of file
+rect 1 11
diff --git a/src/main/resources/materials/block/solid/bookshelf/bookshelf.spm b/src/main/resources/materials/block/solid/bookshelf/bookshelf.spm
new file mode 100644
index 000000000..3681d23be
--- /dev/null
+++ b/src/main/resources/materials/block/solid/bookshelf/bookshelf.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/bookshelf/bookshelf.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/bookshelf/bookshelf.uvs b/src/main/resources/materials/block/solid/bookshelf/bookshelf.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/bookshelf/bookshelf.uvs
rename to src/main/resources/materials/block/solid/bookshelf/bookshelf.uvs
index d7b3f8e1a..6f3cffb75 100644
--- a/src/main/resources/resources/materials/block/solid/bookshelf/bookshelf.uvs
+++ b/src/main/resources/materials/block/solid/bookshelf/bookshelf.uvs
@@ -7,4 +7,4 @@ rect 4 0
 rect 3 2
 rect 3 2
 rect 3 2
-rect 3 2
\ No newline at end of file
+rect 3 2
diff --git a/src/main/resources/materials/block/solid/bricks/bricks.spm b/src/main/resources/materials/block/solid/bricks/bricks.spm
new file mode 100644
index 000000000..3489dfcb2
--- /dev/null
+++ b/src/main/resources/materials/block/solid/bricks/bricks.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/bricks/bricks.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/bricks/bricks.uvs b/src/main/resources/materials/block/solid/bricks/bricks.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/bricks/bricks.uvs
rename to src/main/resources/materials/block/solid/bricks/bricks.uvs
index a1cbd1fad..b339dbaca 100644
--- a/src/main/resources/resources/materials/block/solid/bricks/bricks.uvs
+++ b/src/main/resources/materials/block/solid/bricks/bricks.uvs
@@ -7,4 +7,4 @@ rect 7 0
 rect 7 0
 rect 7 0
 rect 7 0
-rect 7 0
\ No newline at end of file
+rect 7 0
diff --git a/src/main/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.spm b/src/main/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.spm
new file mode 100644
index 000000000..36c197f73
--- /dev/null
+++ b/src/main/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs b/src/main/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
rename to src/main/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
index 5e04871a4..9795896b6 100644
--- a/src/main/resources/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
+++ b/src/main/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
@@ -7,4 +7,4 @@ rect 14 7
 rect 14 7
 rect 14 7
 rect 14 7
-rect 14 7
\ No newline at end of file
+rect 14 7
diff --git a/src/main/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.spm b/src/main/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.spm
new file mode 100644
index 000000000..9f4a9e0c4
--- /dev/null
+++ b/src/main/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs b/src/main/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
rename to src/main/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
index de5996c5a..7ddcb10db 100644
--- a/src/main/resources/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
+++ b/src/main/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
@@ -7,4 +7,4 @@ rect 14 8
 rect 14 8
 rect 14 8
 rect 14 8
-rect 14 8
\ No newline at end of file
+rect 14 8
diff --git a/src/main/resources/materials/block/solid/brownwool/brownwool.spm b/src/main/resources/materials/block/solid/brownwool/brownwool.spm
new file mode 100644
index 000000000..f712dffe7
--- /dev/null
+++ b/src/main/resources/materials/block/solid/brownwool/brownwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/brownwool/brownwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/brownwool/brownwool.uvs b/src/main/resources/materials/block/solid/brownwool/brownwool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/brownwool/brownwool.uvs
rename to src/main/resources/materials/block/solid/brownwool/brownwool.uvs
index 6e027ec14..4d6dd9d46 100644
--- a/src/main/resources/resources/materials/block/solid/brownwool/brownwool.uvs
+++ b/src/main/resources/materials/block/solid/brownwool/brownwool.uvs
@@ -7,4 +7,4 @@ rect 1 10
 rect 1 10
 rect 1 10
 rect 1 10
-rect 1 10
\ No newline at end of file
+rect 1 10
diff --git a/src/main/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm b/src/main/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm
new file mode 100644
index 000000000..510dfe1a0
--- /dev/null
+++ b/src/main/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs b/src/main/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
rename to src/main/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
index 144631c1f..938af7dd2 100644
--- a/src/main/resources/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
+++ b/src/main/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
@@ -7,4 +7,4 @@ rect 0 11
 rect 5 14
 rect 5 14
 rect 5 14
-rect 5 14
\ No newline at end of file
+rect 5 14
diff --git a/src/main/resources/materials/block/solid/circlestonebrick/circlestonebrick.spm b/src/main/resources/materials/block/solid/circlestonebrick/circlestonebrick.spm
new file mode 100644
index 000000000..bc17cbc6c
--- /dev/null
+++ b/src/main/resources/materials/block/solid/circlestonebrick/circlestonebrick.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/circlestonebrick/circlestonebrick.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs b/src/main/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs
rename to src/main/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs
index d25264a49..9409fa47d 100644
--- a/src/main/resources/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs
+++ b/src/main/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs
@@ -7,4 +7,4 @@ rect 5 13
 rect 5 13
 rect 5 13
 rect 5 13
-rect 5 13
\ No newline at end of file
+rect 5 13
diff --git a/src/main/resources/materials/block/solid/clayblock/clayblock.spm b/src/main/resources/materials/block/solid/clayblock/clayblock.spm
new file mode 100644
index 000000000..18164531b
--- /dev/null
+++ b/src/main/resources/materials/block/solid/clayblock/clayblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/clayblock/clayblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/clayblock/clayblock.uvs b/src/main/resources/materials/block/solid/clayblock/clayblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/clayblock/clayblock.uvs
rename to src/main/resources/materials/block/solid/clayblock/clayblock.uvs
index 9cfc53911..505c39c05 100644
--- a/src/main/resources/resources/materials/block/solid/clayblock/clayblock.uvs
+++ b/src/main/resources/materials/block/solid/clayblock/clayblock.uvs
@@ -7,4 +7,4 @@ rect 8 4
 rect 8 4
 rect 8 4
 rect 8 4
-rect 8 4
\ No newline at end of file
+rect 8 4
diff --git a/src/main/resources/materials/block/solid/coalore/coalore.spm b/src/main/resources/materials/block/solid/coalore/coalore.spm
new file mode 100644
index 000000000..bd2fe0211
--- /dev/null
+++ b/src/main/resources/materials/block/solid/coalore/coalore.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/coalore/coalore.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/coalore/coalore.uvs b/src/main/resources/materials/block/solid/coalore/coalore.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/coalore/coalore.uvs
rename to src/main/resources/materials/block/solid/coalore/coalore.uvs
index fab8a6fb7..b1709808d 100644
--- a/src/main/resources/resources/materials/block/solid/coalore/coalore.uvs
+++ b/src/main/resources/materials/block/solid/coalore/coalore.uvs
@@ -7,4 +7,4 @@ rect 2 2
 rect 2 2
 rect 2 2
 rect 2 2
-rect 2 2
\ No newline at end of file
+rect 2 2
diff --git a/src/main/resources/materials/block/solid/cobblestone/cobblestone.spm b/src/main/resources/materials/block/solid/cobblestone/cobblestone.spm
new file mode 100644
index 000000000..ad090eb63
--- /dev/null
+++ b/src/main/resources/materials/block/solid/cobblestone/cobblestone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/cobblestone/cobblestone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/cobblestone/cobblestone.uvs b/src/main/resources/materials/block/solid/cobblestone/cobblestone.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/cobblestone/cobblestone.uvs
rename to src/main/resources/materials/block/solid/cobblestone/cobblestone.uvs
index 80bd9f6c0..4d0f17570 100644
--- a/src/main/resources/resources/materials/block/solid/cobblestone/cobblestone.uvs
+++ b/src/main/resources/materials/block/solid/cobblestone/cobblestone.uvs
@@ -7,4 +7,4 @@ rect 0 1
 rect 0 1
 rect 0 1
 rect 0 1
-rect 0 1
\ No newline at end of file
+rect 0 1
diff --git a/src/main/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm b/src/main/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm
new file mode 100644
index 000000000..70d93bf64
--- /dev/null
+++ b/src/main/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs b/src/main/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
rename to src/main/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
index d1bf13395..459ccc761 100644
--- a/src/main/resources/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
+++ b/src/main/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
@@ -7,4 +7,4 @@ rect 5 6
 rect 5 6
 rect 5 6
 rect 5 6
-rect 5 6
\ No newline at end of file
+rect 5 6
diff --git a/src/main/resources/materials/block/solid/craftingtable/craftingtable.spm b/src/main/resources/materials/block/solid/craftingtable/craftingtable.spm
new file mode 100644
index 000000000..4946d83c8
--- /dev/null
+++ b/src/main/resources/materials/block/solid/craftingtable/craftingtable.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/craftingtable/craftingtable.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/craftingtable/craftingtable.uvs b/src/main/resources/materials/block/solid/craftingtable/craftingtable.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/craftingtable/craftingtable.uvs
rename to src/main/resources/materials/block/solid/craftingtable/craftingtable.uvs
index 7e0eb2c19..0b2fbed0b 100644
--- a/src/main/resources/resources/materials/block/solid/craftingtable/craftingtable.uvs
+++ b/src/main/resources/materials/block/solid/craftingtable/craftingtable.uvs
@@ -7,4 +7,4 @@ rect 11 2
 rect 11 3
 rect 11 3
 rect 12 3
-rect 12 3
\ No newline at end of file
+rect 12 3
diff --git a/src/main/resources/materials/block/solid/cyanwool/cyanwool.spm b/src/main/resources/materials/block/solid/cyanwool/cyanwool.spm
new file mode 100644
index 000000000..6318911ee
--- /dev/null
+++ b/src/main/resources/materials/block/solid/cyanwool/cyanwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/cyanwool/cyanwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/cyanwool/cyanwool.uvs b/src/main/resources/materials/block/solid/cyanwool/cyanwool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/cyanwool/cyanwool.uvs
rename to src/main/resources/materials/block/solid/cyanwool/cyanwool.uvs
index aa80903f9..31b844f77 100644
--- a/src/main/resources/resources/materials/block/solid/cyanwool/cyanwool.uvs
+++ b/src/main/resources/materials/block/solid/cyanwool/cyanwool.uvs
@@ -7,4 +7,4 @@ rect 1 13
 rect 1 13
 rect 1 13
 rect 1 13
-rect 1 13
\ No newline at end of file
+rect 1 13
diff --git a/src/main/resources/materials/block/solid/diamondblock/diamondblock.spm b/src/main/resources/materials/block/solid/diamondblock/diamondblock.spm
new file mode 100644
index 000000000..206c0d5bc
--- /dev/null
+++ b/src/main/resources/materials/block/solid/diamondblock/diamondblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/diamondblock/diamondblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/diamondblock/diamondblock.uvs b/src/main/resources/materials/block/solid/diamondblock/diamondblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/diamondblock/diamondblock.uvs
rename to src/main/resources/materials/block/solid/diamondblock/diamondblock.uvs
index 6962651a1..d272f312a 100644
--- a/src/main/resources/resources/materials/block/solid/diamondblock/diamondblock.uvs
+++ b/src/main/resources/materials/block/solid/diamondblock/diamondblock.uvs
@@ -7,4 +7,4 @@ rect 8 1
 rect 8 1
 rect 8 1
 rect 8 1
-rect 8 1
\ No newline at end of file
+rect 8 1
diff --git a/src/main/resources/materials/block/solid/diamondore/diamondore.spm b/src/main/resources/materials/block/solid/diamondore/diamondore.spm
new file mode 100644
index 000000000..e55f5270a
--- /dev/null
+++ b/src/main/resources/materials/block/solid/diamondore/diamondore.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/diamondore/diamondore.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/diamondore/diamondore.uvs b/src/main/resources/materials/block/solid/diamondore/diamondore.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/diamondore/diamondore.uvs
rename to src/main/resources/materials/block/solid/diamondore/diamondore.uvs
index 1f8ae094d..fbce1684a 100644
--- a/src/main/resources/resources/materials/block/solid/diamondore/diamondore.uvs
+++ b/src/main/resources/materials/block/solid/diamondore/diamondore.uvs
@@ -7,4 +7,4 @@ rect 2 3
 rect 2 3
 rect 2 3
 rect 2 3
-rect 2 3
\ No newline at end of file
+rect 2 3
diff --git a/src/main/resources/materials/block/solid/dirt/dirt.spm b/src/main/resources/materials/block/solid/dirt/dirt.spm
new file mode 100644
index 000000000..cd557646d
--- /dev/null
+++ b/src/main/resources/materials/block/solid/dirt/dirt.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/dirt/dirt.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/dirt/dirt.uvs b/src/main/resources/materials/block/solid/dirt/dirt.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/dirt/dirt.uvs
rename to src/main/resources/materials/block/solid/dirt/dirt.uvs
index 261847f43..ec111182a 100644
--- a/src/main/resources/resources/materials/block/solid/dirt/dirt.uvs
+++ b/src/main/resources/materials/block/solid/dirt/dirt.uvs
@@ -7,4 +7,4 @@ rect 2 0
 rect 2 0
 rect 2 0
 rect 2 0
-rect 2 0
\ No newline at end of file
+rect 2 0
diff --git a/src/main/resources/materials/block/solid/dispenser/dispenser.spm b/src/main/resources/materials/block/solid/dispenser/dispenser.spm
new file mode 100644
index 000000000..e2ae4c3d3
--- /dev/null
+++ b/src/main/resources/materials/block/solid/dispenser/dispenser.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/dispenser/dispenser.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/dispenser/dispenser.uvs b/src/main/resources/materials/block/solid/dispenser/dispenser.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/dispenser/dispenser.uvs
rename to src/main/resources/materials/block/solid/dispenser/dispenser.uvs
index 63f1f44b5..df89826f0 100644
--- a/src/main/resources/resources/materials/block/solid/dispenser/dispenser.uvs
+++ b/src/main/resources/materials/block/solid/dispenser/dispenser.uvs
@@ -7,4 +7,4 @@ rect 6 0
 rect 13 2
 rect 13 2
 rect 13 2
-rect 14 2
\ No newline at end of file
+rect 14 2
diff --git a/src/main/resources/materials/block/solid/doubleslabs/doubleslabs.spm b/src/main/resources/materials/block/solid/doubleslabs/doubleslabs.spm
new file mode 100644
index 000000000..5d4204a5e
--- /dev/null
+++ b/src/main/resources/materials/block/solid/doubleslabs/doubleslabs.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/doubleslabs/doubleslabs.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/doubleslabs/doubleslabs.uvs b/src/main/resources/materials/block/solid/doubleslabs/doubleslabs.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/doubleslabs/doubleslabs.uvs
rename to src/main/resources/materials/block/solid/doubleslabs/doubleslabs.uvs
index d24b3c80b..b30f1896d 100644
--- a/src/main/resources/resources/materials/block/solid/doubleslabs/doubleslabs.uvs
+++ b/src/main/resources/materials/block/solid/doubleslabs/doubleslabs.uvs
@@ -7,4 +7,4 @@ rect 6 0
 rect 5 0
 rect 5 0
 rect 5 0
-rect 5 0
\ No newline at end of file
+rect 5 0
diff --git a/src/main/resources/materials/block/solid/endstone/endstone.spm b/src/main/resources/materials/block/solid/endstone/endstone.spm
new file mode 100644
index 000000000..87777f583
--- /dev/null
+++ b/src/main/resources/materials/block/solid/endstone/endstone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/endstone/endstone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/endstone/endstone.uvs b/src/main/resources/materials/block/solid/endstone/endstone.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/endstone/endstone.uvs
rename to src/main/resources/materials/block/solid/endstone/endstone.uvs
index 3f177ace9..be887b314 100644
--- a/src/main/resources/resources/materials/block/solid/endstone/endstone.uvs
+++ b/src/main/resources/materials/block/solid/endstone/endstone.uvs
@@ -7,4 +7,4 @@ rect 15 10
 rect 15 10
 rect 15 10
 rect 15 10
-rect 15 10
\ No newline at end of file
+rect 15 10
diff --git a/src/main/resources/materials/block/solid/farmland/farmland.spm b/src/main/resources/materials/block/solid/farmland/farmland.spm
new file mode 100644
index 000000000..570ce3818
--- /dev/null
+++ b/src/main/resources/materials/block/solid/farmland/farmland.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/farmland/farmland.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/farmland/farmland.uvs b/src/main/resources/materials/block/solid/farmland/farmland.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/farmland/farmland.uvs
rename to src/main/resources/materials/block/solid/farmland/farmland.uvs
index 33d8aa437..6f15ce0cf 100644
--- a/src/main/resources/resources/materials/block/solid/farmland/farmland.uvs
+++ b/src/main/resources/materials/block/solid/farmland/farmland.uvs
@@ -7,4 +7,4 @@ rect 2 0
 rect 2 0
 rect 2 0
 rect 2 0
-rect 2 0
\ No newline at end of file
+rect 2 0
diff --git a/src/main/resources/materials/block/solid/furnace/furnace.spm b/src/main/resources/materials/block/solid/furnace/furnace.spm
new file mode 100644
index 000000000..832372435
--- /dev/null
+++ b/src/main/resources/materials/block/solid/furnace/furnace.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/furnace/furnace.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/furnace/furnace.uvs b/src/main/resources/materials/block/solid/furnace/furnace.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/furnace/furnace.uvs
rename to src/main/resources/materials/block/solid/furnace/furnace.uvs
index 8a0d4c239..3f870af01 100644
--- a/src/main/resources/resources/materials/block/solid/furnace/furnace.uvs
+++ b/src/main/resources/materials/block/solid/furnace/furnace.uvs
@@ -7,4 +7,4 @@ rect 6 0
 rect 13 2
 rect 13 2
 rect 13 2
-rect 12 2
\ No newline at end of file
+rect 12 2
diff --git a/src/main/resources/materials/block/solid/furnaceon/furnaceon.spm b/src/main/resources/materials/block/solid/furnaceon/furnaceon.spm
new file mode 100644
index 000000000..5d220343b
--- /dev/null
+++ b/src/main/resources/materials/block/solid/furnaceon/furnaceon.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/furnaceon/furnaceon.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/furnaceon/furnaceon.uvs b/src/main/resources/materials/block/solid/furnaceon/furnaceon.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/furnaceon/furnaceon.uvs
rename to src/main/resources/materials/block/solid/furnaceon/furnaceon.uvs
index 4bb364b76..e92a5e875 100644
--- a/src/main/resources/resources/materials/block/solid/furnaceon/furnaceon.uvs
+++ b/src/main/resources/materials/block/solid/furnaceon/furnaceon.uvs
@@ -7,4 +7,4 @@ rect 6 0
 rect 13 2
 rect 13 2
 rect 13 2
-rect 13 3
\ No newline at end of file
+rect 13 3
diff --git a/src/main/resources/materials/block/solid/glass/glass.spm b/src/main/resources/materials/block/solid/glass/glass.spm
new file mode 100644
index 000000000..cc12e9d10
--- /dev/null
+++ b/src/main/resources/materials/block/solid/glass/glass.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/glass/glass.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/glass/glass.uvs b/src/main/resources/materials/block/solid/glass/glass.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/glass/glass.uvs
rename to src/main/resources/materials/block/solid/glass/glass.uvs
index 8a8fccca7..a7e79bed8 100644
--- a/src/main/resources/resources/materials/block/solid/glass/glass.uvs
+++ b/src/main/resources/materials/block/solid/glass/glass.uvs
@@ -7,4 +7,4 @@ rect 1 3
 rect 1 3
 rect 1 3
 rect 1 3
-rect 1 3
\ No newline at end of file
+rect 1 3
diff --git a/src/main/resources/materials/block/solid/glowstone/glowstone.spm b/src/main/resources/materials/block/solid/glowstone/glowstone.spm
new file mode 100644
index 000000000..ec58d8a63
--- /dev/null
+++ b/src/main/resources/materials/block/solid/glowstone/glowstone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/glowstone/glowstone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/glowstone/glowstone.uvs b/src/main/resources/materials/block/solid/glowstone/glowstone.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/glowstone/glowstone.uvs
rename to src/main/resources/materials/block/solid/glowstone/glowstone.uvs
index b019823db..c867238b8 100644
--- a/src/main/resources/resources/materials/block/solid/glowstone/glowstone.uvs
+++ b/src/main/resources/materials/block/solid/glowstone/glowstone.uvs
@@ -7,4 +7,4 @@ rect 9 6
 rect 9 6
 rect 9 6
 rect 9 6
-rect 9 6
\ No newline at end of file
+rect 9 6
diff --git a/src/main/resources/materials/block/solid/goldblock/goldblock.spm b/src/main/resources/materials/block/solid/goldblock/goldblock.spm
new file mode 100644
index 000000000..3b144735c
--- /dev/null
+++ b/src/main/resources/materials/block/solid/goldblock/goldblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/goldblock/goldblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/goldblock/goldblock.uvs b/src/main/resources/materials/block/solid/goldblock/goldblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/goldblock/goldblock.uvs
rename to src/main/resources/materials/block/solid/goldblock/goldblock.uvs
index 8b65d9d37..dfe8696d4 100644
--- a/src/main/resources/resources/materials/block/solid/goldblock/goldblock.uvs
+++ b/src/main/resources/materials/block/solid/goldblock/goldblock.uvs
@@ -7,4 +7,4 @@ rect 7 1
 rect 7 1
 rect 7 1
 rect 7 1
-rect 7 1
\ No newline at end of file
+rect 7 1
diff --git a/src/main/resources/materials/block/solid/goldore/goldore.spm b/src/main/resources/materials/block/solid/goldore/goldore.spm
new file mode 100644
index 000000000..b3a180b2f
--- /dev/null
+++ b/src/main/resources/materials/block/solid/goldore/goldore.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/goldore/goldore.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/goldore/goldore.uvs b/src/main/resources/materials/block/solid/goldore/goldore.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/goldore/goldore.uvs
rename to src/main/resources/materials/block/solid/goldore/goldore.uvs
index cb4626071..0dae0f3d1 100644
--- a/src/main/resources/resources/materials/block/solid/goldore/goldore.uvs
+++ b/src/main/resources/materials/block/solid/goldore/goldore.uvs
@@ -7,4 +7,4 @@ rect 0 2
 rect 0 2
 rect 0 2
 rect 0 2
-rect 0 2
\ No newline at end of file
+rect 0 2
diff --git a/src/main/resources/materials/block/solid/grass/grass.spm b/src/main/resources/materials/block/solid/grass/grass.spm
new file mode 100644
index 000000000..6f50c19b0
--- /dev/null
+++ b/src/main/resources/materials/block/solid/grass/grass.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/grass/grass.uvs
+Material: material://Vanilla/materials/terrainGrass.smt
diff --git a/src/main/resources/resources/materials/block/solid/grass/grass.uvs b/src/main/resources/materials/block/solid/grass/grass.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/grass/grass.uvs
rename to src/main/resources/materials/block/solid/grass/grass.uvs
index 36e5bb4c2..519cdf40e 100644
--- a/src/main/resources/resources/materials/block/solid/grass/grass.uvs
+++ b/src/main/resources/materials/block/solid/grass/grass.uvs
@@ -7,4 +7,4 @@ rect 2 0
 rect 3 0
 rect 3 0
 rect 3 0
-rect 3 0
\ No newline at end of file
+rect 3 0
diff --git a/src/main/resources/materials/block/solid/gravel/gravel.spm b/src/main/resources/materials/block/solid/gravel/gravel.spm
new file mode 100644
index 000000000..1ae5a5bda
--- /dev/null
+++ b/src/main/resources/materials/block/solid/gravel/gravel.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/gravel/gravel.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/gravel/gravel.uvs b/src/main/resources/materials/block/solid/gravel/gravel.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/gravel/gravel.uvs
rename to src/main/resources/materials/block/solid/gravel/gravel.uvs
index 30fe7b582..2bb21fb88 100644
--- a/src/main/resources/resources/materials/block/solid/gravel/gravel.uvs
+++ b/src/main/resources/materials/block/solid/gravel/gravel.uvs
@@ -7,4 +7,4 @@ rect 3 1
 rect 3 1
 rect 3 1
 rect 3 1
-rect 3 1
\ No newline at end of file
+rect 3 1
diff --git a/src/main/resources/materials/block/solid/graywool/graywool.spm b/src/main/resources/materials/block/solid/graywool/graywool.spm
new file mode 100644
index 000000000..ec29b7250
--- /dev/null
+++ b/src/main/resources/materials/block/solid/graywool/graywool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/graywool/graywool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/graywool/graywool.uvs b/src/main/resources/materials/block/solid/graywool/graywool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/graywool/graywool.uvs
rename to src/main/resources/materials/block/solid/graywool/graywool.uvs
index 2abd38c5f..cf3e05426 100644
--- a/src/main/resources/resources/materials/block/solid/graywool/graywool.uvs
+++ b/src/main/resources/materials/block/solid/graywool/graywool.uvs
@@ -7,4 +7,4 @@ rect 2 7
 rect 2 7
 rect 2 7
 rect 2 7
-rect 2 7
\ No newline at end of file
+rect 2 7
diff --git a/src/main/resources/materials/block/solid/greenwool/greenwool.spm b/src/main/resources/materials/block/solid/greenwool/greenwool.spm
new file mode 100644
index 000000000..a352e39de
--- /dev/null
+++ b/src/main/resources/materials/block/solid/greenwool/greenwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/greenwool/greenwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/greenwool/greenwool.uvs b/src/main/resources/materials/block/solid/greenwool/greenwool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/greenwool/greenwool.uvs
rename to src/main/resources/materials/block/solid/greenwool/greenwool.uvs
index c7c23c35d..3c02791d2 100644
--- a/src/main/resources/resources/materials/block/solid/greenwool/greenwool.uvs
+++ b/src/main/resources/materials/block/solid/greenwool/greenwool.uvs
@@ -7,4 +7,4 @@ rect 1 9
 rect 1 9
 rect 1 9
 rect 1 9
-rect 1 9
\ No newline at end of file
+rect 1 9
diff --git a/src/main/resources/materials/block/solid/iceblock/iceblock.spm b/src/main/resources/materials/block/solid/iceblock/iceblock.spm
new file mode 100644
index 000000000..2e582fc87
--- /dev/null
+++ b/src/main/resources/materials/block/solid/iceblock/iceblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/iceblock/iceblock.uvs
+Material: material://Vanilla/materials/terrainAlpha.smt
diff --git a/src/main/resources/resources/materials/block/solid/iceblock/iceblock.uvs b/src/main/resources/materials/block/solid/iceblock/iceblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/iceblock/iceblock.uvs
rename to src/main/resources/materials/block/solid/iceblock/iceblock.uvs
index 6819b27fa..e4718efc8 100644
--- a/src/main/resources/resources/materials/block/solid/iceblock/iceblock.uvs
+++ b/src/main/resources/materials/block/solid/iceblock/iceblock.uvs
@@ -7,4 +7,4 @@ rect 3 4
 rect 3 4
 rect 3 4
 rect 3 4
-rect 3 4
\ No newline at end of file
+rect 3 4
diff --git a/src/main/resources/materials/block/solid/iceblock/snowblock.spm b/src/main/resources/materials/block/solid/iceblock/snowblock.spm
new file mode 100644
index 000000000..cb78f91ea
--- /dev/null
+++ b/src/main/resources/materials/block/solid/iceblock/snowblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/snowblock/snowblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/iceblock/snowblock.uvs b/src/main/resources/materials/block/solid/iceblock/snowblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/iceblock/snowblock.uvs
rename to src/main/resources/materials/block/solid/iceblock/snowblock.uvs
index d85d79ac6..24d4f96ff 100644
--- a/src/main/resources/resources/materials/block/solid/iceblock/snowblock.uvs
+++ b/src/main/resources/materials/block/solid/iceblock/snowblock.uvs
@@ -7,4 +7,4 @@ rect 2 4
 rect 2 4
 rect 2 4
 rect 2 4
-rect 2 4
\ No newline at end of file
+rect 2 4
diff --git a/src/main/resources/materials/block/solid/ironblock/ironblock.spm b/src/main/resources/materials/block/solid/ironblock/ironblock.spm
new file mode 100644
index 000000000..3a89f9e0b
--- /dev/null
+++ b/src/main/resources/materials/block/solid/ironblock/ironblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/ironblock/ironblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/ironblock/ironblock.uvs b/src/main/resources/materials/block/solid/ironblock/ironblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/ironblock/ironblock.uvs
rename to src/main/resources/materials/block/solid/ironblock/ironblock.uvs
index 19c08131a..ff9a30523 100644
--- a/src/main/resources/resources/materials/block/solid/ironblock/ironblock.uvs
+++ b/src/main/resources/materials/block/solid/ironblock/ironblock.uvs
@@ -7,4 +7,4 @@ rect 6 1
 rect 6 1
 rect 6 1
 rect 6 1
-rect 6 1
\ No newline at end of file
+rect 6 1
diff --git a/src/main/resources/materials/block/solid/ironore/ironore.spm b/src/main/resources/materials/block/solid/ironore/ironore.spm
new file mode 100644
index 000000000..c1d558c83
--- /dev/null
+++ b/src/main/resources/materials/block/solid/ironore/ironore.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/ironore/ironore.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/ironore/ironore.uvs b/src/main/resources/materials/block/solid/ironore/ironore.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/ironore/ironore.uvs
rename to src/main/resources/materials/block/solid/ironore/ironore.uvs
index 7eeb777e0..1b1122e97 100644
--- a/src/main/resources/resources/materials/block/solid/ironore/ironore.uvs
+++ b/src/main/resources/materials/block/solid/ironore/ironore.uvs
@@ -7,4 +7,4 @@ rect 1 2
 rect 1 2
 rect 1 2
 rect 1 2
-rect 1 2
\ No newline at end of file
+rect 1 2
diff --git a/src/main/resources/materials/block/solid/jackolantern/jackolantern.spm b/src/main/resources/materials/block/solid/jackolantern/jackolantern.spm
new file mode 100644
index 000000000..39f4b3a70
--- /dev/null
+++ b/src/main/resources/materials/block/solid/jackolantern/jackolantern.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/jackolantern/jackolantern.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/jackolantern/jackolantern.uvs b/src/main/resources/materials/block/solid/jackolantern/jackolantern.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/jackolantern/jackolantern.uvs
rename to src/main/resources/materials/block/solid/jackolantern/jackolantern.uvs
index ccba074ef..fcbcd31d8 100644
--- a/src/main/resources/resources/materials/block/solid/jackolantern/jackolantern.uvs
+++ b/src/main/resources/materials/block/solid/jackolantern/jackolantern.uvs
@@ -7,4 +7,4 @@ rect 6 6
 rect 6 7
 rect 6 7
 rect 6 7
-rect 8 7
\ No newline at end of file
+rect 8 7
diff --git a/src/main/resources/materials/block/solid/jukebox/jukebox.spm b/src/main/resources/materials/block/solid/jukebox/jukebox.spm
new file mode 100644
index 000000000..040649a74
--- /dev/null
+++ b/src/main/resources/materials/block/solid/jukebox/jukebox.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/jukebox/jukebox.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/jukebox/jukebox.uvs b/src/main/resources/materials/block/solid/jukebox/jukebox.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/jukebox/jukebox.uvs
rename to src/main/resources/materials/block/solid/jukebox/jukebox.uvs
index a7d30de0e..cda041a35 100644
--- a/src/main/resources/resources/materials/block/solid/jukebox/jukebox.uvs
+++ b/src/main/resources/materials/block/solid/jukebox/jukebox.uvs
@@ -7,4 +7,4 @@ rect 10 4
 rect 10 4
 rect 10 4
 rect 10 4
-rect 10 4
\ No newline at end of file
+rect 10 4
diff --git a/src/main/resources/materials/block/solid/jungleleaves/jungleleaves.spm b/src/main/resources/materials/block/solid/jungleleaves/jungleleaves.spm
new file mode 100644
index 000000000..1a02caa40
--- /dev/null
+++ b/src/main/resources/materials/block/solid/jungleleaves/jungleleaves.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/jungleleaves/jungleleaves.uvs
+Material: material://Vanilla/materials/terrainFoliage.smt
diff --git a/src/main/resources/resources/materials/block/solid/jungleleaves/jungleleaves.uvs b/src/main/resources/materials/block/solid/jungleleaves/jungleleaves.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/jungleleaves/jungleleaves.uvs
rename to src/main/resources/materials/block/solid/jungleleaves/jungleleaves.uvs
index ebd5da2b2..d40615879 100644
--- a/src/main/resources/resources/materials/block/solid/jungleleaves/jungleleaves.uvs
+++ b/src/main/resources/materials/block/solid/jungleleaves/jungleleaves.uvs
@@ -7,4 +7,4 @@ rect 4 12
 rect 4 12
 rect 4 12
 rect 4 12
-rect 4 12
\ No newline at end of file
+rect 4 12
diff --git a/src/main/resources/materials/block/solid/jungleplanks/jungleplanks.spm b/src/main/resources/materials/block/solid/jungleplanks/jungleplanks.spm
new file mode 100644
index 000000000..1b161df49
--- /dev/null
+++ b/src/main/resources/materials/block/solid/jungleplanks/jungleplanks.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/jungleplanks/jungleplanks.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/jungleplanks/jungleplanks.uvs b/src/main/resources/materials/block/solid/jungleplanks/jungleplanks.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/jungleplanks/jungleplanks.uvs
rename to src/main/resources/materials/block/solid/jungleplanks/jungleplanks.uvs
index 5152e18db..58c5d5008 100644
--- a/src/main/resources/resources/materials/block/solid/jungleplanks/jungleplanks.uvs
+++ b/src/main/resources/materials/block/solid/jungleplanks/jungleplanks.uvs
@@ -7,4 +7,4 @@ rect 7 12
 rect 7 12
 rect 7 12
 rect 7 12
-rect 7 12
\ No newline at end of file
+rect 7 12
diff --git a/src/main/resources/materials/block/solid/junglewood/junglewood.spm b/src/main/resources/materials/block/solid/junglewood/junglewood.spm
new file mode 100644
index 000000000..4d3ca254a
--- /dev/null
+++ b/src/main/resources/materials/block/solid/junglewood/junglewood.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/junglewood/junglewood.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/junglewood/junglewood.uvs b/src/main/resources/materials/block/solid/junglewood/junglewood.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/junglewood/junglewood.uvs
rename to src/main/resources/materials/block/solid/junglewood/junglewood.uvs
index 67ea5bd0b..fc9cc053f 100644
--- a/src/main/resources/resources/materials/block/solid/junglewood/junglewood.uvs
+++ b/src/main/resources/materials/block/solid/junglewood/junglewood.uvs
@@ -7,4 +7,4 @@ rect 5 1
 rect 9 9
 rect 9 9
 rect 9 9
-rect 9 9
\ No newline at end of file
+rect 9 9
diff --git a/src/main/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm b/src/main/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm
new file mode 100644
index 000000000..24b503d91
--- /dev/null
+++ b/src/main/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs b/src/main/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
rename to src/main/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
index d38529c94..89cb5ddf1 100644
--- a/src/main/resources/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
+++ b/src/main/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
@@ -7,4 +7,4 @@ rect 0 9
 rect 0 9
 rect 0 9
 rect 0 9
-rect 0 9
\ No newline at end of file
+rect 0 9
diff --git a/src/main/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm b/src/main/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm
new file mode 100644
index 000000000..53b3e9fe9
--- /dev/null
+++ b/src/main/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/lapislazuliore/lapislazuliore.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs b/src/main/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs
rename to src/main/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs
index 428fcddbd..d0039d1f0 100644
--- a/src/main/resources/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs
+++ b/src/main/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs
@@ -7,4 +7,4 @@ rect 0 10
 rect 0 10
 rect 0 10
 rect 0 10
-rect 0 10
\ No newline at end of file
+rect 0 10
diff --git a/src/main/resources/materials/block/solid/lightbluewool/lightbluewool.spm b/src/main/resources/materials/block/solid/lightbluewool/lightbluewool.spm
new file mode 100644
index 000000000..4eee2f687
--- /dev/null
+++ b/src/main/resources/materials/block/solid/lightbluewool/lightbluewool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/lightbluewool/lightbluewool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/lightbluewool/lightbluewool.uvs b/src/main/resources/materials/block/solid/lightbluewool/lightbluewool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/lightbluewool/lightbluewool.uvs
rename to src/main/resources/materials/block/solid/lightbluewool/lightbluewool.uvs
index b1466359a..b7b63ad8f 100644
--- a/src/main/resources/resources/materials/block/solid/lightbluewool/lightbluewool.uvs
+++ b/src/main/resources/materials/block/solid/lightbluewool/lightbluewool.uvs
@@ -7,4 +7,4 @@ rect 2 11
 rect 2 11
 rect 2 11
 rect 2 11
-rect 2 11
\ No newline at end of file
+rect 2 11
diff --git a/src/main/resources/materials/block/solid/lightgraywool/lightgraywool.spm b/src/main/resources/materials/block/solid/lightgraywool/lightgraywool.spm
new file mode 100644
index 000000000..2370e292d
--- /dev/null
+++ b/src/main/resources/materials/block/solid/lightgraywool/lightgraywool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/lightgraywool/lightgraywool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/lightgraywool/lightgraywool.uvs b/src/main/resources/materials/block/solid/lightgraywool/lightgraywool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/lightgraywool/lightgraywool.uvs
rename to src/main/resources/materials/block/solid/lightgraywool/lightgraywool.uvs
index dd5b5eb51..700bbeec1 100644
--- a/src/main/resources/resources/materials/block/solid/lightgraywool/lightgraywool.uvs
+++ b/src/main/resources/materials/block/solid/lightgraywool/lightgraywool.uvs
@@ -7,4 +7,4 @@ rect 1 14
 rect 1 14
 rect 1 14
 rect 1 14
-rect 1 14
\ No newline at end of file
+rect 1 14
diff --git a/src/main/resources/materials/block/solid/lightgreenwool/lightgreenwool.spm b/src/main/resources/materials/block/solid/lightgreenwool/lightgreenwool.spm
new file mode 100644
index 000000000..97195ad90
--- /dev/null
+++ b/src/main/resources/materials/block/solid/lightgreenwool/lightgreenwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/lightgreenwool/lightgreenwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs b/src/main/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs
rename to src/main/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs
index b575b1740..e3350518d 100644
--- a/src/main/resources/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs
+++ b/src/main/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs
@@ -7,4 +7,4 @@ rect 2 9
 rect 2 9
 rect 2 9
 rect 2 9
-rect 2 9
\ No newline at end of file
+rect 2 9
diff --git a/src/main/resources/materials/block/solid/magentawool/magentawool.spm b/src/main/resources/materials/block/solid/magentawool/magentawool.spm
new file mode 100644
index 000000000..872d5fa90
--- /dev/null
+++ b/src/main/resources/materials/block/solid/magentawool/magentawool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/magentawool/magentawool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/magentawool/magentawool.uvs b/src/main/resources/materials/block/solid/magentawool/magentawool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/magentawool/magentawool.uvs
rename to src/main/resources/materials/block/solid/magentawool/magentawool.uvs
index c2c02be9a..7522daa58 100644
--- a/src/main/resources/resources/materials/block/solid/magentawool/magentawool.uvs
+++ b/src/main/resources/materials/block/solid/magentawool/magentawool.uvs
@@ -7,4 +7,4 @@ rect 2 12
 rect 2 12
 rect 2 12
 rect 2 12
-rect 2 12
\ No newline at end of file
+rect 2 12
diff --git a/src/main/resources/materials/block/solid/melon/melon.spm b/src/main/resources/materials/block/solid/melon/melon.spm
new file mode 100644
index 000000000..e09fb167a
--- /dev/null
+++ b/src/main/resources/materials/block/solid/melon/melon.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/melon/melon.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/melon/melon.uvs b/src/main/resources/materials/block/solid/melon/melon.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/melon/melon.uvs
rename to src/main/resources/materials/block/solid/melon/melon.uvs
index d092f57d7..84a41a779 100644
--- a/src/main/resources/resources/materials/block/solid/melon/melon.uvs
+++ b/src/main/resources/materials/block/solid/melon/melon.uvs
@@ -7,4 +7,4 @@ rect 9 8
 rect 8 8
 rect 8 8
 rect 8 8
-rect 8 8
\ No newline at end of file
+rect 8 8
diff --git a/src/main/resources/materials/block/solid/mobspawner/mobspawner.spm b/src/main/resources/materials/block/solid/mobspawner/mobspawner.spm
new file mode 100644
index 000000000..28c27e938
--- /dev/null
+++ b/src/main/resources/materials/block/solid/mobspawner/mobspawner.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/mobspawner/mobspawner.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/mobspawner/mobspawner.uvs b/src/main/resources/materials/block/solid/mobspawner/mobspawner.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/mobspawner/mobspawner.uvs
rename to src/main/resources/materials/block/solid/mobspawner/mobspawner.uvs
index 617b26a2a..7fc5e5576 100644
--- a/src/main/resources/resources/materials/block/solid/mobspawner/mobspawner.uvs
+++ b/src/main/resources/materials/block/solid/mobspawner/mobspawner.uvs
@@ -7,4 +7,4 @@ rect 1 4
 rect 1 4
 rect 1 4
 rect 1 4
-rect 1 4
\ No newline at end of file
+rect 1 4
diff --git a/src/main/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm b/src/main/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm
new file mode 100644
index 000000000..43c0e3556
--- /dev/null
+++ b/src/main/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/mossycobblestone/mossycobblestone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs b/src/main/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs
rename to src/main/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs
index 4af99dea4..d1f478ceb 100644
--- a/src/main/resources/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs
+++ b/src/main/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs
@@ -7,4 +7,4 @@ rect 4 2
 rect 4 2
 rect 4 2
 rect 4 2
-rect 4 2
\ No newline at end of file
+rect 4 2
diff --git a/src/main/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm b/src/main/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm
new file mode 100644
index 000000000..d26ce558f
--- /dev/null
+++ b/src/main/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/mossystonebrick/mossystonebrick.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs b/src/main/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs
rename to src/main/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs
index 4e6e4a6a1..6ba489786 100644
--- a/src/main/resources/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs
+++ b/src/main/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs
@@ -7,4 +7,4 @@ rect 4 6
 rect 4 6
 rect 4 6
 rect 4 6
-rect 4 6
\ No newline at end of file
+rect 4 6
diff --git a/src/main/resources/materials/block/solid/mycelium/mycelium.spm b/src/main/resources/materials/block/solid/mycelium/mycelium.spm
new file mode 100644
index 000000000..959bb4834
--- /dev/null
+++ b/src/main/resources/materials/block/solid/mycelium/mycelium.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/mycelium/mycelium.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/mycelium/mycelium.uvs b/src/main/resources/materials/block/solid/mycelium/mycelium.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/mycelium/mycelium.uvs
rename to src/main/resources/materials/block/solid/mycelium/mycelium.uvs
index 00cff3dcd..a272da413 100644
--- a/src/main/resources/resources/materials/block/solid/mycelium/mycelium.uvs
+++ b/src/main/resources/materials/block/solid/mycelium/mycelium.uvs
@@ -7,4 +7,4 @@ rect 2 0
 rect 13 4
 rect 13 4
 rect 13 4
-rect 13 4
\ No newline at end of file
+rect 13 4
diff --git a/src/main/resources/materials/block/solid/netherbrick/netherbrick.spm b/src/main/resources/materials/block/solid/netherbrick/netherbrick.spm
new file mode 100644
index 000000000..7b5eefa3d
--- /dev/null
+++ b/src/main/resources/materials/block/solid/netherbrick/netherbrick.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/netherbrick/netherbrick.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/netherbrick/netherbrick.uvs b/src/main/resources/materials/block/solid/netherbrick/netherbrick.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/netherbrick/netherbrick.uvs
rename to src/main/resources/materials/block/solid/netherbrick/netherbrick.uvs
index 11b0f226a..8f03a1088 100644
--- a/src/main/resources/resources/materials/block/solid/netherbrick/netherbrick.uvs
+++ b/src/main/resources/materials/block/solid/netherbrick/netherbrick.uvs
@@ -7,4 +7,4 @@ rect 0 14
 rect 0 14
 rect 0 14
 rect 0 14
-rect 0 14
\ No newline at end of file
+rect 0 14
diff --git a/src/main/resources/materials/block/solid/netherrack/netherrack.spm b/src/main/resources/materials/block/solid/netherrack/netherrack.spm
new file mode 100644
index 000000000..ba6ee14ab
--- /dev/null
+++ b/src/main/resources/materials/block/solid/netherrack/netherrack.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/netherrack/netherrack.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/netherrack/netherrack.uvs b/src/main/resources/materials/block/solid/netherrack/netherrack.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/netherrack/netherrack.uvs
rename to src/main/resources/materials/block/solid/netherrack/netherrack.uvs
index 11fb48c47..0fcc2864e 100644
--- a/src/main/resources/resources/materials/block/solid/netherrack/netherrack.uvs
+++ b/src/main/resources/materials/block/solid/netherrack/netherrack.uvs
@@ -7,4 +7,4 @@ rect 7 6
 rect 7 6
 rect 7 6
 rect 7 6
-rect 7 6
\ No newline at end of file
+rect 7 6
diff --git a/src/main/resources/materials/block/solid/noteblock/noteblock.spm b/src/main/resources/materials/block/solid/noteblock/noteblock.spm
new file mode 100644
index 000000000..c5e4a3df1
--- /dev/null
+++ b/src/main/resources/materials/block/solid/noteblock/noteblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/noteblock/noteblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/noteblock/noteblock.uvs b/src/main/resources/materials/block/solid/noteblock/noteblock.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/noteblock/noteblock.uvs
rename to src/main/resources/materials/block/solid/noteblock/noteblock.uvs
index f0815a6b1..de6bda309 100644
--- a/src/main/resources/resources/materials/block/solid/noteblock/noteblock.uvs
+++ b/src/main/resources/materials/block/solid/noteblock/noteblock.uvs
@@ -7,4 +7,4 @@ rect 10 4
 rect 10 4
 rect 10 4
 rect 10 4
-rect 10 4
\ No newline at end of file
+rect 10 4
diff --git a/src/main/resources/materials/block/solid/oakleaves/oakleaves.spm b/src/main/resources/materials/block/solid/oakleaves/oakleaves.spm
new file mode 100644
index 000000000..a59843e8e
--- /dev/null
+++ b/src/main/resources/materials/block/solid/oakleaves/oakleaves.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/oakleaves/oakleaves.uvs
+Material: material://Vanilla/materials/terrainFoliage.smt
diff --git a/src/main/resources/resources/materials/block/solid/oakleaves/oakleaves.uvs b/src/main/resources/materials/block/solid/oakleaves/oakleaves.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/oakleaves/oakleaves.uvs
rename to src/main/resources/materials/block/solid/oakleaves/oakleaves.uvs
index 71d84aebe..d8f4d5002 100644
--- a/src/main/resources/resources/materials/block/solid/oakleaves/oakleaves.uvs
+++ b/src/main/resources/materials/block/solid/oakleaves/oakleaves.uvs
@@ -7,4 +7,4 @@ rect 4 3
 rect 4 3
 rect 4 3
 rect 4 3
-rect 4 3
\ No newline at end of file
+rect 4 3
diff --git a/src/main/resources/materials/block/solid/oakplanks/oakplanks.spm b/src/main/resources/materials/block/solid/oakplanks/oakplanks.spm
new file mode 100644
index 000000000..5cbd29fa5
--- /dev/null
+++ b/src/main/resources/materials/block/solid/oakplanks/oakplanks.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/oakplanks/oakplanks.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/oakplanks/oakplanks.uvs b/src/main/resources/materials/block/solid/oakplanks/oakplanks.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/oakplanks/oakplanks.uvs
rename to src/main/resources/materials/block/solid/oakplanks/oakplanks.uvs
index 903478e9e..c25c31a41 100644
--- a/src/main/resources/resources/materials/block/solid/oakplanks/oakplanks.uvs
+++ b/src/main/resources/materials/block/solid/oakplanks/oakplanks.uvs
@@ -7,4 +7,4 @@ rect 4 0
 rect 4 0
 rect 4 0
 rect 4 0
-rect 4 0
\ No newline at end of file
+rect 4 0
diff --git a/src/main/resources/materials/block/solid/oakwood/oakwood.spm b/src/main/resources/materials/block/solid/oakwood/oakwood.spm
new file mode 100644
index 000000000..31fa81fbb
--- /dev/null
+++ b/src/main/resources/materials/block/solid/oakwood/oakwood.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/oakwood/oakwood.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/oakwood/oakwood.uvs b/src/main/resources/materials/block/solid/oakwood/oakwood.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/oakwood/oakwood.uvs
rename to src/main/resources/materials/block/solid/oakwood/oakwood.uvs
index fc9e42712..2c39cf955 100644
--- a/src/main/resources/resources/materials/block/solid/oakwood/oakwood.uvs
+++ b/src/main/resources/materials/block/solid/oakwood/oakwood.uvs
@@ -7,4 +7,4 @@ rect 5 1
 rect 4 1
 rect 4 1
 rect 4 1
-rect 4 1
\ No newline at end of file
+rect 4 1
diff --git a/src/main/resources/materials/block/solid/obsidian/obsidian.spm b/src/main/resources/materials/block/solid/obsidian/obsidian.spm
new file mode 100644
index 000000000..916bc7ff6
--- /dev/null
+++ b/src/main/resources/materials/block/solid/obsidian/obsidian.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/obsidian/obsidian.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/obsidian/obsidian.uvs b/src/main/resources/materials/block/solid/obsidian/obsidian.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/obsidian/obsidian.uvs
rename to src/main/resources/materials/block/solid/obsidian/obsidian.uvs
index 2110f4e7c..1e10ec605 100644
--- a/src/main/resources/resources/materials/block/solid/obsidian/obsidian.uvs
+++ b/src/main/resources/materials/block/solid/obsidian/obsidian.uvs
@@ -7,4 +7,4 @@ rect 5 2
 rect 5 2
 rect 5 2
 rect 5 2
-rect 5 2
\ No newline at end of file
+rect 5 2
diff --git a/src/main/resources/materials/block/solid/orangewool/orangewool.spm b/src/main/resources/materials/block/solid/orangewool/orangewool.spm
new file mode 100644
index 000000000..8807446b1
--- /dev/null
+++ b/src/main/resources/materials/block/solid/orangewool/orangewool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/orangewool/orangewool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/orangewool/orangewool.uvs b/src/main/resources/materials/block/solid/orangewool/orangewool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/orangewool/orangewool.uvs
rename to src/main/resources/materials/block/solid/orangewool/orangewool.uvs
index 9ff38260f..f7dcb0407 100644
--- a/src/main/resources/resources/materials/block/solid/orangewool/orangewool.uvs
+++ b/src/main/resources/materials/block/solid/orangewool/orangewool.uvs
@@ -7,4 +7,4 @@ rect 2 13
 rect 2 13
 rect 2 13
 rect 2 13
-rect 2 13
\ No newline at end of file
+rect 2 13
diff --git a/src/main/resources/materials/block/solid/pinkwool/pinkwool.spm b/src/main/resources/materials/block/solid/pinkwool/pinkwool.spm
new file mode 100644
index 000000000..74b8ec3ed
--- /dev/null
+++ b/src/main/resources/materials/block/solid/pinkwool/pinkwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/pinkwool/pinkwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/pinkwool/pinkwool.uvs b/src/main/resources/materials/block/solid/pinkwool/pinkwool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/pinkwool/pinkwool.uvs
rename to src/main/resources/materials/block/solid/pinkwool/pinkwool.uvs
index cb7c9e78d..62542f46b 100644
--- a/src/main/resources/resources/materials/block/solid/pinkwool/pinkwool.uvs
+++ b/src/main/resources/materials/block/solid/pinkwool/pinkwool.uvs
@@ -7,4 +7,4 @@ rect 2 8
 rect 2 8
 rect 2 8
 rect 2 8
-rect 2 8
\ No newline at end of file
+rect 2 8
diff --git a/src/main/resources/materials/block/solid/pumpkin/pumpkin.spm b/src/main/resources/materials/block/solid/pumpkin/pumpkin.spm
new file mode 100644
index 000000000..9313cd4c0
--- /dev/null
+++ b/src/main/resources/materials/block/solid/pumpkin/pumpkin.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/pumpkin/pumpkin.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/pumpkin/pumpkin.uvs b/src/main/resources/materials/block/solid/pumpkin/pumpkin.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/pumpkin/pumpkin.uvs
rename to src/main/resources/materials/block/solid/pumpkin/pumpkin.uvs
index 9db8ea6c4..60bd9ccbc 100644
--- a/src/main/resources/resources/materials/block/solid/pumpkin/pumpkin.uvs
+++ b/src/main/resources/materials/block/solid/pumpkin/pumpkin.uvs
@@ -7,4 +7,4 @@ rect 6 6
 rect 6 7
 rect 6 7
 rect 6 7
-rect 7 7
\ No newline at end of file
+rect 7 7
diff --git a/src/main/resources/materials/block/solid/purplewool/purplewool.spm b/src/main/resources/materials/block/solid/purplewool/purplewool.spm
new file mode 100644
index 000000000..2ee831572
--- /dev/null
+++ b/src/main/resources/materials/block/solid/purplewool/purplewool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/purplewool/purplewool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/purplewool/purplewool.uvs b/src/main/resources/materials/block/solid/purplewool/purplewool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/purplewool/purplewool.uvs
rename to src/main/resources/materials/block/solid/purplewool/purplewool.uvs
index 33bb02d82..26a3f7603 100644
--- a/src/main/resources/resources/materials/block/solid/purplewool/purplewool.uvs
+++ b/src/main/resources/materials/block/solid/purplewool/purplewool.uvs
@@ -7,4 +7,4 @@ rect 1 12
 rect 1 12
 rect 1 12
 rect 1 12
-rect 1 12
\ No newline at end of file
+rect 1 12
diff --git a/src/main/resources/materials/block/solid/redmushroomcap/redmushroomcap.spm b/src/main/resources/materials/block/solid/redmushroomcap/redmushroomcap.spm
new file mode 100644
index 000000000..b2bbd1676
--- /dev/null
+++ b/src/main/resources/materials/block/solid/redmushroomcap/redmushroomcap.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/redmushroomcap/redmushroomcap.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs b/src/main/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs
rename to src/main/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs
index d91ae1379..4e8c617df 100644
--- a/src/main/resources/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs
+++ b/src/main/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs
@@ -7,4 +7,4 @@ rect 13 7
 rect 13 7
 rect 13 7
 rect 13 7
-rect 13 7
\ No newline at end of file
+rect 13 7
diff --git a/src/main/resources/materials/block/solid/redmushroomtail/redmushroomtail.spm b/src/main/resources/materials/block/solid/redmushroomtail/redmushroomtail.spm
new file mode 100644
index 000000000..58430b174
--- /dev/null
+++ b/src/main/resources/materials/block/solid/redmushroomtail/redmushroomtail.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/redmushroomtail/redmushroomtail.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs b/src/main/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs
rename to src/main/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs
index 68e94210d..dc9958569 100644
--- a/src/main/resources/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs
+++ b/src/main/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs
@@ -7,4 +7,4 @@ rect 13 8
 rect 13 8
 rect 13 8
 rect 13 8
-rect 13 8
\ No newline at end of file
+rect 13 8
diff --git a/src/main/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm b/src/main/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm
new file mode 100644
index 000000000..d8292b646
--- /dev/null
+++ b/src/main/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/redstonelampoff/redstonelampoff.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs b/src/main/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs
rename to src/main/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs
index a74bf5b1b..729974a90 100644
--- a/src/main/resources/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs
+++ b/src/main/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs
@@ -7,4 +7,4 @@ rect 3 13
 rect 3 13
 rect 3 13
 rect 3 13
-rect 3 13
\ No newline at end of file
+rect 3 13
diff --git a/src/main/resources/materials/block/solid/redstonelampon/redstonelampon.spm b/src/main/resources/materials/block/solid/redstonelampon/redstonelampon.spm
new file mode 100644
index 000000000..892dcd42a
--- /dev/null
+++ b/src/main/resources/materials/block/solid/redstonelampon/redstonelampon.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/redstonelampon/redstonelampon.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/redstonelampon/redstonelampon.uvs b/src/main/resources/materials/block/solid/redstonelampon/redstonelampon.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/redstonelampon/redstonelampon.uvs
rename to src/main/resources/materials/block/solid/redstonelampon/redstonelampon.uvs
index 1e97ed238..0e6ffdbc2 100644
--- a/src/main/resources/resources/materials/block/solid/redstonelampon/redstonelampon.uvs
+++ b/src/main/resources/materials/block/solid/redstonelampon/redstonelampon.uvs
@@ -7,4 +7,4 @@ rect 4 13
 rect 4 13
 rect 4 13
 rect 4 13
-rect 4 13
\ No newline at end of file
+rect 4 13
diff --git a/src/main/resources/materials/block/solid/redstoneore/redstoneore.spm b/src/main/resources/materials/block/solid/redstoneore/redstoneore.spm
new file mode 100644
index 000000000..6dee12642
--- /dev/null
+++ b/src/main/resources/materials/block/solid/redstoneore/redstoneore.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/redstoneore/redstoneore.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/redstoneore/redstoneore.uvs b/src/main/resources/materials/block/solid/redstoneore/redstoneore.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/redstoneore/redstoneore.uvs
rename to src/main/resources/materials/block/solid/redstoneore/redstoneore.uvs
index 19df5e088..abf17e407 100644
--- a/src/main/resources/resources/materials/block/solid/redstoneore/redstoneore.uvs
+++ b/src/main/resources/materials/block/solid/redstoneore/redstoneore.uvs
@@ -7,4 +7,4 @@ rect 3 3
 rect 3 3
 rect 3 3
 rect 3 3
-rect 3 3
\ No newline at end of file
+rect 3 3
diff --git a/src/main/resources/materials/block/solid/redwool/redwool.spm b/src/main/resources/materials/block/solid/redwool/redwool.spm
new file mode 100644
index 000000000..68c5a9cb2
--- /dev/null
+++ b/src/main/resources/materials/block/solid/redwool/redwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/redwool/redwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/redwool/redwool.uvs b/src/main/resources/materials/block/solid/redwool/redwool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/redwool/redwool.uvs
rename to src/main/resources/materials/block/solid/redwool/redwool.uvs
index 85dc17bbd..df6418015 100644
--- a/src/main/resources/resources/materials/block/solid/redwool/redwool.uvs
+++ b/src/main/resources/materials/block/solid/redwool/redwool.uvs
@@ -7,4 +7,4 @@ rect 1 8
 rect 1 8
 rect 1 8
 rect 1 8
-rect 1 8
\ No newline at end of file
+rect 1 8
diff --git a/src/main/resources/materials/block/solid/sand/sand.spm b/src/main/resources/materials/block/solid/sand/sand.spm
new file mode 100644
index 000000000..71386a3a4
--- /dev/null
+++ b/src/main/resources/materials/block/solid/sand/sand.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/sand/sand.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/sand/sand.uvs b/src/main/resources/materials/block/solid/sand/sand.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/sand/sand.uvs
rename to src/main/resources/materials/block/solid/sand/sand.uvs
index 4c5172138..eff7d4a01 100644
--- a/src/main/resources/resources/materials/block/solid/sand/sand.uvs
+++ b/src/main/resources/materials/block/solid/sand/sand.uvs
@@ -7,4 +7,4 @@ rect 2 1
 rect 2 1
 rect 2 1
 rect 2 1
-rect 2 1
\ No newline at end of file
+rect 2 1
diff --git a/src/main/resources/materials/block/solid/sandstone/sandstone.spm b/src/main/resources/materials/block/solid/sandstone/sandstone.spm
new file mode 100644
index 000000000..71c0c67af
--- /dev/null
+++ b/src/main/resources/materials/block/solid/sandstone/sandstone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/sandstone/sandstone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/sandstone/sandstone.uvs b/src/main/resources/materials/block/solid/sandstone/sandstone.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/sandstone/sandstone.uvs
rename to src/main/resources/materials/block/solid/sandstone/sandstone.uvs
index b14adb746..6898d1360 100644
--- a/src/main/resources/resources/materials/block/solid/sandstone/sandstone.uvs
+++ b/src/main/resources/materials/block/solid/sandstone/sandstone.uvs
@@ -7,4 +7,4 @@ rect 0 11
 rect 0 12
 rect 0 12
 rect 0 12
-rect 0 12
\ No newline at end of file
+rect 0 12
diff --git a/src/main/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm b/src/main/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm
new file mode 100644
index 000000000..1c5e80588
--- /dev/null
+++ b/src/main/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/smoothsandstone/smoothsandstone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs b/src/main/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs
rename to src/main/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs
index cf67fc3af..391fe9f5e 100644
--- a/src/main/resources/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs
+++ b/src/main/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs
@@ -7,4 +7,4 @@ rect 0 11
 rect 6 14
 rect 6 14
 rect 6 14
-rect 6 14
\ No newline at end of file
+rect 6 14
diff --git a/src/main/resources/materials/block/solid/snowblock/snowblock.spm b/src/main/resources/materials/block/solid/snowblock/snowblock.spm
new file mode 100644
index 000000000..cb78f91ea
--- /dev/null
+++ b/src/main/resources/materials/block/solid/snowblock/snowblock.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/snowblock/snowblock.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/snowblock/snowblock.uvs b/src/main/resources/materials/block/solid/snowblock/snowblock.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/snowblock/snowblock.uvs
rename to src/main/resources/materials/block/solid/snowblock/snowblock.uvs
index d85d79ac6..24d4f96ff 100644
--- a/src/main/resources/resources/materials/block/solid/snowblock/snowblock.uvs
+++ b/src/main/resources/materials/block/solid/snowblock/snowblock.uvs
@@ -7,4 +7,4 @@ rect 2 4
 rect 2 4
 rect 2 4
 rect 2 4
-rect 2 4
\ No newline at end of file
+rect 2 4
diff --git a/src/main/resources/materials/block/solid/soulsand/soulsand.spm b/src/main/resources/materials/block/solid/soulsand/soulsand.spm
new file mode 100644
index 000000000..aae506690
--- /dev/null
+++ b/src/main/resources/materials/block/solid/soulsand/soulsand.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/soulsand/soulsand.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/soulsand/soulsand.uvs b/src/main/resources/materials/block/solid/soulsand/soulsand.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/soulsand/soulsand.uvs
rename to src/main/resources/materials/block/solid/soulsand/soulsand.uvs
index ee6863de1..e2ca76f18 100644
--- a/src/main/resources/resources/materials/block/solid/soulsand/soulsand.uvs
+++ b/src/main/resources/materials/block/solid/soulsand/soulsand.uvs
@@ -7,4 +7,4 @@ rect 8 6
 rect 8 6
 rect 8 6
 rect 8 6
-rect 8 6
\ No newline at end of file
+rect 8 6
diff --git a/src/main/resources/materials/block/solid/sponge/sponge.spm b/src/main/resources/materials/block/solid/sponge/sponge.spm
new file mode 100644
index 000000000..2d14046c3
--- /dev/null
+++ b/src/main/resources/materials/block/solid/sponge/sponge.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/sponge/sponge.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/sponge/sponge.uvs b/src/main/resources/materials/block/solid/sponge/sponge.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/sponge/sponge.uvs
rename to src/main/resources/materials/block/solid/sponge/sponge.uvs
index 467e935bc..09c0c1623 100644
--- a/src/main/resources/resources/materials/block/solid/sponge/sponge.uvs
+++ b/src/main/resources/materials/block/solid/sponge/sponge.uvs
@@ -7,4 +7,4 @@ rect 0 3
 rect 0 3
 rect 0 3
 rect 0 3
-rect 0 3
\ No newline at end of file
+rect 0 3
diff --git a/src/main/resources/materials/block/solid/spruceleaves/spruceleaves.spm b/src/main/resources/materials/block/solid/spruceleaves/spruceleaves.spm
new file mode 100644
index 000000000..276d58f97
--- /dev/null
+++ b/src/main/resources/materials/block/solid/spruceleaves/spruceleaves.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/spruceleaves/spruceleaves.uvs
+Material: material://Vanilla/materials/terrainFoliage.smt
diff --git a/src/main/resources/resources/materials/block/solid/spruceleaves/spruceleaves.uvs b/src/main/resources/materials/block/solid/spruceleaves/spruceleaves.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/spruceleaves/spruceleaves.uvs
rename to src/main/resources/materials/block/solid/spruceleaves/spruceleaves.uvs
index 88e236b8a..96e245f14 100644
--- a/src/main/resources/resources/materials/block/solid/spruceleaves/spruceleaves.uvs
+++ b/src/main/resources/materials/block/solid/spruceleaves/spruceleaves.uvs
@@ -7,4 +7,4 @@ rect 4 8
 rect 4 8
 rect 4 8
 rect 4 8
-rect 4 8
\ No newline at end of file
+rect 4 8
diff --git a/src/main/resources/materials/block/solid/spruceplanks/spruceplanks.spm b/src/main/resources/materials/block/solid/spruceplanks/spruceplanks.spm
new file mode 100644
index 000000000..6780917dd
--- /dev/null
+++ b/src/main/resources/materials/block/solid/spruceplanks/spruceplanks.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/spruceplanks/spruceplanks.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/spruceplanks/spruceplanks.uvs b/src/main/resources/materials/block/solid/spruceplanks/spruceplanks.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/spruceplanks/spruceplanks.uvs
rename to src/main/resources/materials/block/solid/spruceplanks/spruceplanks.uvs
index 413f6bc84..1f3b55ed5 100644
--- a/src/main/resources/resources/materials/block/solid/spruceplanks/spruceplanks.uvs
+++ b/src/main/resources/materials/block/solid/spruceplanks/spruceplanks.uvs
@@ -7,4 +7,4 @@ rect 6 12
 rect 6 12
 rect 6 12
 rect 6 12
-rect 6 12
\ No newline at end of file
+rect 6 12
diff --git a/src/main/resources/materials/block/solid/sprucewood/sprucewood.spm b/src/main/resources/materials/block/solid/sprucewood/sprucewood.spm
new file mode 100644
index 000000000..28ba95be2
--- /dev/null
+++ b/src/main/resources/materials/block/solid/sprucewood/sprucewood.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/sprucewood/sprucewood.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/sprucewood/sprucewood.uvs b/src/main/resources/materials/block/solid/sprucewood/sprucewood.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/sprucewood/sprucewood.uvs
rename to src/main/resources/materials/block/solid/sprucewood/sprucewood.uvs
index 70168b809..cbb9dadb1 100644
--- a/src/main/resources/resources/materials/block/solid/sprucewood/sprucewood.uvs
+++ b/src/main/resources/materials/block/solid/sprucewood/sprucewood.uvs
@@ -7,4 +7,4 @@ rect 5 1
 rect 4 7
 rect 4 7
 rect 4 7
-rect 4 7
\ No newline at end of file
+rect 4 7
diff --git a/src/main/resources/materials/block/solid/stone/stone.spm b/src/main/resources/materials/block/solid/stone/stone.spm
new file mode 100644
index 000000000..226207504
--- /dev/null
+++ b/src/main/resources/materials/block/solid/stone/stone.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/stone/stone.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/stone/stone.uvs b/src/main/resources/materials/block/solid/stone/stone.uvs
similarity index 87%
rename from src/main/resources/resources/materials/block/solid/stone/stone.uvs
rename to src/main/resources/materials/block/solid/stone/stone.uvs
index 2eb9ec3c6..6879eb700 100644
--- a/src/main/resources/resources/materials/block/solid/stone/stone.uvs
+++ b/src/main/resources/materials/block/solid/stone/stone.uvs
@@ -2,4 +2,4 @@
 # See TextureMeshLoader
 scale 16 16
 size 1 1
-rect 1 0
\ No newline at end of file
+rect 1 0
diff --git a/src/main/resources/materials/block/solid/stonebrick/stonebrick.spm b/src/main/resources/materials/block/solid/stonebrick/stonebrick.spm
new file mode 100644
index 000000000..e3c496b9e
--- /dev/null
+++ b/src/main/resources/materials/block/solid/stonebrick/stonebrick.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/stonebrick/stonebrick.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/stonebrick/stonebrick.uvs b/src/main/resources/materials/block/solid/stonebrick/stonebrick.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/stonebrick/stonebrick.uvs
rename to src/main/resources/materials/block/solid/stonebrick/stonebrick.uvs
index dbcc13521..602af1af3 100644
--- a/src/main/resources/resources/materials/block/solid/stonebrick/stonebrick.uvs
+++ b/src/main/resources/materials/block/solid/stonebrick/stonebrick.uvs
@@ -7,4 +7,4 @@ rect 6 3
 rect 6 3
 rect 6 3
 rect 6 3
-rect 6 3
\ No newline at end of file
+rect 6 3
diff --git a/src/main/resources/materials/block/solid/tnt/tnt.spm b/src/main/resources/materials/block/solid/tnt/tnt.spm
new file mode 100644
index 000000000..6d6e67702
--- /dev/null
+++ b/src/main/resources/materials/block/solid/tnt/tnt.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/tnt/tnt.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/tnt/tnt.uvs b/src/main/resources/materials/block/solid/tnt/tnt.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/tnt/tnt.uvs
rename to src/main/resources/materials/block/solid/tnt/tnt.uvs
index 5cdadc27d..18defefce 100644
--- a/src/main/resources/resources/materials/block/solid/tnt/tnt.uvs
+++ b/src/main/resources/materials/block/solid/tnt/tnt.uvs
@@ -7,4 +7,4 @@ rect 10 0
 rect 8 0
 rect 8 0
 rect 8 0
-rect 8 0
\ No newline at end of file
+rect 8 0
diff --git a/src/main/resources/materials/block/solid/whitewool/whitewool.spm b/src/main/resources/materials/block/solid/whitewool/whitewool.spm
new file mode 100644
index 000000000..44b6a5964
--- /dev/null
+++ b/src/main/resources/materials/block/solid/whitewool/whitewool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/whitewool/whitewool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/whitewool/whitewool.uvs b/src/main/resources/materials/block/solid/whitewool/whitewool.uvs
similarity index 92%
rename from src/main/resources/resources/materials/block/solid/whitewool/whitewool.uvs
rename to src/main/resources/materials/block/solid/whitewool/whitewool.uvs
index 0bc7ebf2b..e7feeb80c 100644
--- a/src/main/resources/resources/materials/block/solid/whitewool/whitewool.uvs
+++ b/src/main/resources/materials/block/solid/whitewool/whitewool.uvs
@@ -7,4 +7,4 @@ rect 0 4
 rect 0 4
 rect 0 4
 rect 0 4
-rect 0 4
\ No newline at end of file
+rect 0 4
diff --git a/src/main/resources/materials/block/solid/yellowwool/yellowwool.spm b/src/main/resources/materials/block/solid/yellowwool/yellowwool.spm
new file mode 100644
index 000000000..5c5411d36
--- /dev/null
+++ b/src/main/resources/materials/block/solid/yellowwool/yellowwool.spm
@@ -0,0 +1,2 @@
+Mesh: cubemesh://Vanilla/materials/block/solid/yellowwool/yellowwool.uvs
+Material: material://Vanilla/materials/terrain.smt
diff --git a/src/main/resources/resources/materials/block/solid/yellowwool/yellowwool.uvs b/src/main/resources/materials/block/solid/yellowwool/yellowwool.uvs
similarity index 91%
rename from src/main/resources/resources/materials/block/solid/yellowwool/yellowwool.uvs
rename to src/main/resources/materials/block/solid/yellowwool/yellowwool.uvs
index 6c54c67bf..86e1e12bf 100644
--- a/src/main/resources/resources/materials/block/solid/yellowwool/yellowwool.uvs
+++ b/src/main/resources/materials/block/solid/yellowwool/yellowwool.uvs
@@ -7,4 +7,4 @@ rect 2 10
 rect 2 10
 rect 2 10
 rect 2 10
-rect 2 10
\ No newline at end of file
+rect 2 10
diff --git a/src/main/resources/materials/terrain.smt b/src/main/resources/materials/terrain.smt
new file mode 100644
index 000000000..1088fcca9
--- /dev/null
+++ b/src/main/resources/materials/terrain.smt
@@ -0,0 +1,4 @@
+Shader: shader://Vanilla/shaders/terrain.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
diff --git a/src/main/resources/materials/terrainAlpha.smt b/src/main/resources/materials/terrainAlpha.smt
new file mode 100644
index 000000000..f4ad47934
--- /dev/null
+++ b/src/main/resources/materials/terrainAlpha.smt
@@ -0,0 +1,7 @@
+Shader: shader://Vanilla/shaders/terrainAlpha.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
+
+RenderState:
+    Layer: 2
diff --git a/src/main/resources/materials/terrainFoliage.smt b/src/main/resources/materials/terrainFoliage.smt
new file mode 100644
index 000000000..af5359b80
--- /dev/null
+++ b/src/main/resources/materials/terrainFoliage.smt
@@ -0,0 +1,7 @@
+Shader: shader://Vanilla/shaders/terrainFoliage.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
+
+RenderState:
+    Layer: 2
diff --git a/src/main/resources/materials/terrainGrass.smt b/src/main/resources/materials/terrainGrass.smt
new file mode 100644
index 000000000..74425830a
--- /dev/null
+++ b/src/main/resources/materials/terrainGrass.smt
@@ -0,0 +1,4 @@
+Shader: shader://Vanilla/shaders/terrainGrass.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
diff --git a/src/main/resources/materials/terrainLiquid.smt b/src/main/resources/materials/terrainLiquid.smt
new file mode 100644
index 000000000..0e9fbb026
--- /dev/null
+++ b/src/main/resources/materials/terrainLiquid.smt
@@ -0,0 +1,7 @@
+Shader: shader://Vanilla/shaders/liquid.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
+
+RenderState:
+    Layer: 3
diff --git a/src/main/resources/materials/terrainTallGrass.smt b/src/main/resources/materials/terrainTallGrass.smt
new file mode 100644
index 000000000..af5359b80
--- /dev/null
+++ b/src/main/resources/materials/terrainTallGrass.smt
@@ -0,0 +1,7 @@
+Shader: shader://Vanilla/shaders/terrainFoliage.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
+
+RenderState:
+    Layer: 2
diff --git a/src/main/resources/materials/terrainWater.smt b/src/main/resources/materials/terrainWater.smt
new file mode 100644
index 000000000..cefecba4a
--- /dev/null
+++ b/src/main/resources/materials/terrainWater.smt
@@ -0,0 +1,7 @@
+Shader: shader://Vanilla/shaders/water.ssf
+
+MaterialParams:
+    Diffuse: texture://Vanilla/terrain.png
+
+RenderState:
+    Layer: 3
diff --git a/src/main/resources/misc/dial.png b/src/main/resources/misc/dial.png
new file mode 100644
index 000000000..0fd26327a
Binary files /dev/null and b/src/main/resources/misc/dial.png differ
diff --git a/src/main/resources/misc/explosion.png b/src/main/resources/misc/explosion.png
new file mode 100644
index 000000000..0951d2ea3
Binary files /dev/null and b/src/main/resources/misc/explosion.png differ
diff --git a/src/main/resources/misc/foliagecolor.png b/src/main/resources/misc/foliagecolor.png
new file mode 100644
index 000000000..244c14e1c
Binary files /dev/null and b/src/main/resources/misc/foliagecolor.png differ
diff --git a/src/main/resources/misc/footprint.png b/src/main/resources/misc/footprint.png
new file mode 100644
index 000000000..90be19c22
Binary files /dev/null and b/src/main/resources/misc/footprint.png differ
diff --git a/src/main/resources/misc/glint.png b/src/main/resources/misc/glint.png
new file mode 100644
index 000000000..5a8271e6b
Binary files /dev/null and b/src/main/resources/misc/glint.png differ
diff --git a/src/main/resources/misc/grasscolor.png b/src/main/resources/misc/grasscolor.png
new file mode 100644
index 000000000..d97538fa3
Binary files /dev/null and b/src/main/resources/misc/grasscolor.png differ
diff --git a/src/main/resources/misc/mapbg.png b/src/main/resources/misc/mapbg.png
new file mode 100644
index 000000000..5183275b7
Binary files /dev/null and b/src/main/resources/misc/mapbg.png differ
diff --git a/src/main/resources/misc/mapicons.png b/src/main/resources/misc/mapicons.png
new file mode 100644
index 000000000..b047cfb5b
Binary files /dev/null and b/src/main/resources/misc/mapicons.png differ
diff --git a/src/main/resources/misc/particlefield.png b/src/main/resources/misc/particlefield.png
new file mode 100644
index 000000000..89880c906
Binary files /dev/null and b/src/main/resources/misc/particlefield.png differ
diff --git a/src/main/resources/misc/pumpkinblur.png b/src/main/resources/misc/pumpkinblur.png
new file mode 100644
index 000000000..1b0c388ea
Binary files /dev/null and b/src/main/resources/misc/pumpkinblur.png differ
diff --git a/src/main/resources/misc/shadow.png b/src/main/resources/misc/shadow.png
new file mode 100644
index 000000000..5f6f97c15
Binary files /dev/null and b/src/main/resources/misc/shadow.png differ
diff --git a/src/main/resources/misc/tunnel.png b/src/main/resources/misc/tunnel.png
new file mode 100644
index 000000000..22e8ce616
Binary files /dev/null and b/src/main/resources/misc/tunnel.png differ
diff --git a/src/main/resources/misc/vignette.png b/src/main/resources/misc/vignette.png
new file mode 100644
index 000000000..31f4bd19c
Binary files /dev/null and b/src/main/resources/misc/vignette.png differ
diff --git a/src/main/resources/misc/water.png b/src/main/resources/misc/water.png
new file mode 100644
index 000000000..0ce7d7c65
Binary files /dev/null and b/src/main/resources/misc/water.png differ
diff --git a/src/main/resources/misc/watercolor.png b/src/main/resources/misc/watercolor.png
new file mode 100644
index 000000000..a65496a4b
Binary files /dev/null and b/src/main/resources/misc/watercolor.png differ
diff --git a/src/main/resources/mob/cat_black.png b/src/main/resources/mob/cat_black.png
new file mode 100644
index 000000000..0fe22db4c
Binary files /dev/null and b/src/main/resources/mob/cat_black.png differ
diff --git a/src/main/resources/mob/cat_red.png b/src/main/resources/mob/cat_red.png
new file mode 100644
index 000000000..b4204045d
Binary files /dev/null and b/src/main/resources/mob/cat_red.png differ
diff --git a/src/main/resources/mob/cat_siamese.png b/src/main/resources/mob/cat_siamese.png
new file mode 100644
index 000000000..615c7a717
Binary files /dev/null and b/src/main/resources/mob/cat_siamese.png differ
diff --git a/src/main/resources/mob/cavespider.png b/src/main/resources/mob/cavespider.png
new file mode 100644
index 000000000..4f9915387
Binary files /dev/null and b/src/main/resources/mob/cavespider.png differ
diff --git a/src/main/resources/mob/chicken.png b/src/main/resources/mob/chicken.png
new file mode 100644
index 000000000..9bf3ebfc6
Binary files /dev/null and b/src/main/resources/mob/chicken.png differ
diff --git a/src/main/resources/mob/cow.png b/src/main/resources/mob/cow.png
new file mode 100644
index 000000000..4d9e50665
Binary files /dev/null and b/src/main/resources/mob/cow.png differ
diff --git a/src/main/resources/mob/enderdragon/beam.png b/src/main/resources/mob/enderdragon/beam.png
new file mode 100644
index 000000000..c08522215
Binary files /dev/null and b/src/main/resources/mob/enderdragon/beam.png differ
diff --git a/src/main/resources/mob/enderdragon/body.png b/src/main/resources/mob/enderdragon/body.png
new file mode 100644
index 000000000..b8e8669e8
Binary files /dev/null and b/src/main/resources/mob/enderdragon/body.png differ
diff --git a/src/main/resources/mob/enderdragon/crystal.png b/src/main/resources/mob/enderdragon/crystal.png
new file mode 100644
index 000000000..ed36485b9
Binary files /dev/null and b/src/main/resources/mob/enderdragon/crystal.png differ
diff --git a/src/main/resources/mob/enderdragon/dragon.png b/src/main/resources/mob/enderdragon/dragon.png
new file mode 100644
index 000000000..077bcf442
Binary files /dev/null and b/src/main/resources/mob/enderdragon/dragon.png differ
diff --git a/src/main/resources/mob/enderdragon/ender.png b/src/main/resources/mob/enderdragon/ender.png
new file mode 100644
index 000000000..896c691ac
Binary files /dev/null and b/src/main/resources/mob/enderdragon/ender.png differ
diff --git a/src/main/resources/mob/enderdragon/ender_eyes.png b/src/main/resources/mob/enderdragon/ender_eyes.png
new file mode 100644
index 000000000..8aded41b9
Binary files /dev/null and b/src/main/resources/mob/enderdragon/ender_eyes.png differ
diff --git a/src/main/resources/mob/enderdragon/shuffle.png b/src/main/resources/mob/enderdragon/shuffle.png
new file mode 100644
index 000000000..1ba539eec
Binary files /dev/null and b/src/main/resources/mob/enderdragon/shuffle.png differ
diff --git a/src/main/resources/mob/fire.png b/src/main/resources/mob/fire.png
new file mode 100644
index 000000000..659801ebd
Binary files /dev/null and b/src/main/resources/mob/fire.png differ
diff --git a/src/main/resources/mob/ghast.png b/src/main/resources/mob/ghast.png
new file mode 100644
index 000000000..0e39d24dd
Binary files /dev/null and b/src/main/resources/mob/ghast.png differ
diff --git a/src/main/resources/mob/ghast_fire.png b/src/main/resources/mob/ghast_fire.png
new file mode 100644
index 000000000..2f4870305
Binary files /dev/null and b/src/main/resources/mob/ghast_fire.png differ
diff --git a/src/main/resources/mob/lava.png b/src/main/resources/mob/lava.png
new file mode 100644
index 000000000..b3d4573b6
Binary files /dev/null and b/src/main/resources/mob/lava.png differ
diff --git a/src/main/resources/mob/ozelot.png b/src/main/resources/mob/ozelot.png
new file mode 100644
index 000000000..6b474c610
Binary files /dev/null and b/src/main/resources/mob/ozelot.png differ
diff --git a/src/main/resources/mob/pig.png b/src/main/resources/mob/pig.png
new file mode 100644
index 000000000..f8bc5cdd1
Binary files /dev/null and b/src/main/resources/mob/pig.png differ
diff --git a/src/main/resources/mob/pigman.png b/src/main/resources/mob/pigman.png
new file mode 100644
index 000000000..a68256b2d
Binary files /dev/null and b/src/main/resources/mob/pigman.png differ
diff --git a/src/main/resources/mob/redcow.png b/src/main/resources/mob/redcow.png
new file mode 100644
index 000000000..d4d90eae4
Binary files /dev/null and b/src/main/resources/mob/redcow.png differ
diff --git a/src/main/resources/mob/saddle.png b/src/main/resources/mob/saddle.png
new file mode 100644
index 000000000..bcab85dac
Binary files /dev/null and b/src/main/resources/mob/saddle.png differ
diff --git a/src/main/resources/mob/sheep.png b/src/main/resources/mob/sheep.png
new file mode 100644
index 000000000..9b3765267
Binary files /dev/null and b/src/main/resources/mob/sheep.png differ
diff --git a/src/main/resources/mob/sheep_fur.png b/src/main/resources/mob/sheep_fur.png
new file mode 100644
index 000000000..30d46c8a4
Binary files /dev/null and b/src/main/resources/mob/sheep_fur.png differ
diff --git a/src/main/resources/mob/silverfish.png b/src/main/resources/mob/silverfish.png
new file mode 100644
index 000000000..93e3b5561
Binary files /dev/null and b/src/main/resources/mob/silverfish.png differ
diff --git a/src/main/resources/mob/slime.png b/src/main/resources/mob/slime.png
new file mode 100644
index 000000000..6df05f95e
Binary files /dev/null and b/src/main/resources/mob/slime.png differ
diff --git a/src/main/resources/mob/snowman.png b/src/main/resources/mob/snowman.png
new file mode 100644
index 000000000..42c9aac41
Binary files /dev/null and b/src/main/resources/mob/snowman.png differ
diff --git a/src/main/resources/mob/spider.png b/src/main/resources/mob/spider.png
new file mode 100644
index 000000000..84d547c77
Binary files /dev/null and b/src/main/resources/mob/spider.png differ
diff --git a/src/main/resources/mob/spider_eyes.png b/src/main/resources/mob/spider_eyes.png
new file mode 100644
index 000000000..50907d30e
Binary files /dev/null and b/src/main/resources/mob/spider_eyes.png differ
diff --git a/src/main/resources/mob/squid.png b/src/main/resources/mob/squid.png
new file mode 100644
index 000000000..c9284112a
Binary files /dev/null and b/src/main/resources/mob/squid.png differ
diff --git a/src/main/resources/mob/villager.png b/src/main/resources/mob/villager.png
new file mode 100644
index 000000000..5c1399b85
Binary files /dev/null and b/src/main/resources/mob/villager.png differ
diff --git a/src/main/resources/mob/villager/butcher.png b/src/main/resources/mob/villager/butcher.png
new file mode 100644
index 000000000..70f8b2435
Binary files /dev/null and b/src/main/resources/mob/villager/butcher.png differ
diff --git a/src/main/resources/mob/villager/farmer.png b/src/main/resources/mob/villager/farmer.png
new file mode 100644
index 000000000..e8f7c205e
Binary files /dev/null and b/src/main/resources/mob/villager/farmer.png differ
diff --git a/src/main/resources/mob/villager/librarian.png b/src/main/resources/mob/villager/librarian.png
new file mode 100644
index 000000000..9bb44612b
Binary files /dev/null and b/src/main/resources/mob/villager/librarian.png differ
diff --git a/src/main/resources/mob/villager/priest.png b/src/main/resources/mob/villager/priest.png
new file mode 100644
index 000000000..5445ebb6d
Binary files /dev/null and b/src/main/resources/mob/villager/priest.png differ
diff --git a/src/main/resources/mob/villager/smith.png b/src/main/resources/mob/villager/smith.png
new file mode 100644
index 000000000..d35df3854
Binary files /dev/null and b/src/main/resources/mob/villager/smith.png differ
diff --git a/src/main/resources/mob/villager/villager.png b/src/main/resources/mob/villager/villager.png
new file mode 100644
index 000000000..a2fce541d
Binary files /dev/null and b/src/main/resources/mob/villager/villager.png differ
diff --git a/src/main/resources/mob/villager_golem.png b/src/main/resources/mob/villager_golem.png
new file mode 100644
index 000000000..520c0113c
Binary files /dev/null and b/src/main/resources/mob/villager_golem.png differ
diff --git a/src/main/resources/mob/wolf.png b/src/main/resources/mob/wolf.png
new file mode 100644
index 000000000..0ee5aa2c1
Binary files /dev/null and b/src/main/resources/mob/wolf.png differ
diff --git a/src/main/resources/mob/wolf_angry.png b/src/main/resources/mob/wolf_angry.png
new file mode 100644
index 000000000..6d884d886
Binary files /dev/null and b/src/main/resources/mob/wolf_angry.png differ
diff --git a/src/main/resources/mob/wolf_tame.png b/src/main/resources/mob/wolf_tame.png
new file mode 100644
index 000000000..bf7b1b29f
Binary files /dev/null and b/src/main/resources/mob/wolf_tame.png differ
diff --git a/src/main/resources/particles.png b/src/main/resources/particles.png
new file mode 100644
index 000000000..2b17d725a
Binary files /dev/null and b/src/main/resources/particles.png differ
diff --git a/src/main/resources/properties.yml b/src/main/resources/properties.yml
index 67096888c..1dc7644f6 100644
--- a/src/main/resources/properties.yml
+++ b/src/main/resources/properties.yml
@@ -1,6 +1,7 @@
 name: ${project.name}
 version: ${releaseVersion} b${buildNumber}
 description: ${project.description}
+
 author: ${project.organization.name}
 website: ${project.organization.url}
 
@@ -9,4 +10,4 @@ load: startup
 platform: BOTH
 
 data:
-    protocol: ${protocolVersion}
\ No newline at end of file
+    protocol: ${protocolVersion}
diff --git a/src/main/resources/resources/recipes.yml b/src/main/resources/recipes.yml
similarity index 100%
rename from src/main/resources/resources/recipes.yml
rename to src/main/resources/recipes.yml
diff --git a/src/main/resources/resources/achievement/bg.png b/src/main/resources/resources/achievement/bg.png
deleted file mode 100644
index 23dd85a83..000000000
Binary files a/src/main/resources/resources/achievement/bg.png and /dev/null differ
diff --git a/src/main/resources/resources/achievement/icons.png b/src/main/resources/resources/achievement/icons.png
deleted file mode 100644
index 6a3f3ea58..000000000
Binary files a/src/main/resources/resources/achievement/icons.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/chain_1.png b/src/main/resources/resources/armor/chain_1.png
deleted file mode 100644
index 3632af5be..000000000
Binary files a/src/main/resources/resources/armor/chain_1.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/chain_2.png b/src/main/resources/resources/armor/chain_2.png
deleted file mode 100644
index 330425b11..000000000
Binary files a/src/main/resources/resources/armor/chain_2.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/cloth_1.png b/src/main/resources/resources/armor/cloth_1.png
deleted file mode 100644
index 707b8b683..000000000
Binary files a/src/main/resources/resources/armor/cloth_1.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/cloth_2.png b/src/main/resources/resources/armor/cloth_2.png
deleted file mode 100644
index 18d190a23..000000000
Binary files a/src/main/resources/resources/armor/cloth_2.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/diamond_1.png b/src/main/resources/resources/armor/diamond_1.png
deleted file mode 100644
index 742460ab7..000000000
Binary files a/src/main/resources/resources/armor/diamond_1.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/diamond_2.png b/src/main/resources/resources/armor/diamond_2.png
deleted file mode 100644
index b384bbc75..000000000
Binary files a/src/main/resources/resources/armor/diamond_2.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/gold_1.png b/src/main/resources/resources/armor/gold_1.png
deleted file mode 100644
index 3996aaf78..000000000
Binary files a/src/main/resources/resources/armor/gold_1.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/gold_2.png b/src/main/resources/resources/armor/gold_2.png
deleted file mode 100644
index 540d0b837..000000000
Binary files a/src/main/resources/resources/armor/gold_2.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/iron_1.png b/src/main/resources/resources/armor/iron_1.png
deleted file mode 100644
index 2399f7bfa..000000000
Binary files a/src/main/resources/resources/armor/iron_1.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/iron_2.png b/src/main/resources/resources/armor/iron_2.png
deleted file mode 100644
index 9c70fd5ca..000000000
Binary files a/src/main/resources/resources/armor/iron_2.png and /dev/null differ
diff --git a/src/main/resources/resources/armor/power.png b/src/main/resources/resources/armor/power.png
deleted file mode 100644
index ed2abf756..000000000
Binary files a/src/main/resources/resources/armor/power.png and /dev/null differ
diff --git a/src/main/resources/resources/art/kz.png b/src/main/resources/resources/art/kz.png
deleted file mode 100644
index ecc4823e6..000000000
Binary files a/src/main/resources/resources/art/kz.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/creeper/creeper.png b/src/main/resources/resources/entities/creeper/creeper.png
deleted file mode 100644
index 51c1410d9..000000000
Binary files a/src/main/resources/resources/entities/creeper/creeper.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/creeper/creeper.smt b/src/main/resources/resources/entities/creeper/creeper.smt
deleted file mode 100644
index 12da776b1..000000000
--- a/src/main/resources/resources/entities/creeper/creeper.smt
+++ /dev/null
@@ -1,5 +0,0 @@
-Shader: shader://Spout/resources/fallbacks/fallback.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/entities/creeper/creeper.png
-    Color: color(1,1,1,1)
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/creeper/creeper.spm b/src/main/resources/resources/entities/creeper/creeper.spm
deleted file mode 100644
index 805cc497e..000000000
--- a/src/main/resources/resources/entities/creeper/creeper.spm
+++ /dev/null
@@ -1,3 +0,0 @@
-Mesh: mesh://Vanilla/resources/entities/creeper/creeper.obj
-Material: material://Vanilla/resources/entities/creeper/creeper.smt
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/enderman/enderman.png b/src/main/resources/resources/entities/enderman/enderman.png
deleted file mode 100644
index 4c946b4c3..000000000
Binary files a/src/main/resources/resources/entities/enderman/enderman.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/enderman/enderman.smt b/src/main/resources/resources/entities/enderman/enderman.smt
deleted file mode 100644
index 6142e4396..000000000
--- a/src/main/resources/resources/entities/enderman/enderman.smt
+++ /dev/null
@@ -1,5 +0,0 @@
-Shader: shader://Spout/resources/fallbacks/fallback.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/entities/enderman/enderman.png
-    Color: color(1,1,1,1)
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/enderman/enderman.spm b/src/main/resources/resources/entities/enderman/enderman.spm
deleted file mode 100644
index 352ff573c..000000000
--- a/src/main/resources/resources/entities/enderman/enderman.spm
+++ /dev/null
@@ -1,3 +0,0 @@
-Mesh: mesh://Vanilla/resources/entities/enderman/enderman.obj
-Material: material://Vanilla/resources/entities/enderman/enderman.smt
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/enderman/enderman_eyes.png b/src/main/resources/resources/entities/enderman/enderman_eyes.png
deleted file mode 100644
index a298ec9de..000000000
Binary files a/src/main/resources/resources/entities/enderman/enderman_eyes.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/human/human.png b/src/main/resources/resources/entities/human/human.png
deleted file mode 100644
index 4bf748081..000000000
Binary files a/src/main/resources/resources/entities/human/human.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/human/human.smt b/src/main/resources/resources/entities/human/human.smt
deleted file mode 100644
index 0c73025d0..000000000
--- a/src/main/resources/resources/entities/human/human.smt
+++ /dev/null
@@ -1,5 +0,0 @@
-Shader: shader://Spout/resources/fallbacks/fallback.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/entities/human/human.png
-    Color: color(1,1,1,1)
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/human/human.spm b/src/main/resources/resources/entities/human/human.spm
deleted file mode 100644
index 9ebec813c..000000000
--- a/src/main/resources/resources/entities/human/human.spm
+++ /dev/null
@@ -1,3 +0,0 @@
-Mesh: mesh://Vanilla/resources/entities/human/human.obj
-Material: material://Vanilla/resources/entities/human/human.smt
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/pigzombie/pigzombie.png b/src/main/resources/resources/entities/pigzombie/pigzombie.png
deleted file mode 100644
index 61ba73c4b..000000000
Binary files a/src/main/resources/resources/entities/pigzombie/pigzombie.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/skeleton/skeleton.png b/src/main/resources/resources/entities/skeleton/skeleton.png
deleted file mode 100644
index 289512a8d..000000000
Binary files a/src/main/resources/resources/entities/skeleton/skeleton.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/skeleton/skeleton.smt b/src/main/resources/resources/entities/skeleton/skeleton.smt
deleted file mode 100644
index f8630da68..000000000
--- a/src/main/resources/resources/entities/skeleton/skeleton.smt
+++ /dev/null
@@ -1,5 +0,0 @@
-Shader: shader://Spout/resources/fallbacks/fallback.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/entities/skeleton/skeleton.png
-    Color: color(1,1,1,1)
\ No newline at end of file
diff --git a/src/main/resources/resources/entities/skeleton/skeleton.spm b/src/main/resources/resources/entities/skeleton/skeleton.spm
deleted file mode 100644
index 3a5a09839..000000000
--- a/src/main/resources/resources/entities/skeleton/skeleton.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: mesh://Vanilla/resources/entities/skeleton/skeleton.obj
-Material: material://Vanilla/resources/entities/skeleton/skeleton.smt
diff --git a/src/main/resources/resources/entities/zombie/zombie.png b/src/main/resources/resources/entities/zombie/zombie.png
deleted file mode 100644
index e976f90d6..000000000
Binary files a/src/main/resources/resources/entities/zombie/zombie.png and /dev/null differ
diff --git a/src/main/resources/resources/entities/zombie/zombie.smt b/src/main/resources/resources/entities/zombie/zombie.smt
deleted file mode 100644
index 88a56b763..000000000
--- a/src/main/resources/resources/entities/zombie/zombie.smt
+++ /dev/null
@@ -1,5 +0,0 @@
-Shader: shader://Spout/resources/fallbacks/fallback.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/entities/zombie/zombie.png
-    Color: color(1,1,1,1)
\ No newline at end of file
diff --git a/src/main/resources/resources/environment/clouds.png b/src/main/resources/resources/environment/clouds.png
deleted file mode 100644
index 013e94614..000000000
Binary files a/src/main/resources/resources/environment/clouds.png and /dev/null differ
diff --git a/src/main/resources/resources/environment/light_normal.png b/src/main/resources/resources/environment/light_normal.png
deleted file mode 100644
index 023f3cd5d..000000000
Binary files a/src/main/resources/resources/environment/light_normal.png and /dev/null differ
diff --git a/src/main/resources/resources/environment/rain.png b/src/main/resources/resources/environment/rain.png
deleted file mode 100644
index 6d780b01a..000000000
Binary files a/src/main/resources/resources/environment/rain.png and /dev/null differ
diff --git a/src/main/resources/resources/environment/snow.png b/src/main/resources/resources/environment/snow.png
deleted file mode 100644
index 653655acb..000000000
Binary files a/src/main/resources/resources/environment/snow.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/alchemy.png b/src/main/resources/resources/gui/alchemy.png
deleted file mode 100644
index 214a44bcc..000000000
Binary files a/src/main/resources/resources/gui/alchemy.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/allitems.png b/src/main/resources/resources/gui/allitems.png
deleted file mode 100644
index e1e5d7797..000000000
Binary files a/src/main/resources/resources/gui/allitems.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/background.png b/src/main/resources/resources/gui/background.png
deleted file mode 100644
index 51a5960d8..000000000
Binary files a/src/main/resources/resources/gui/background.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/container.png b/src/main/resources/resources/gui/container.png
deleted file mode 100644
index bd1d383ce..000000000
Binary files a/src/main/resources/resources/gui/container.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/crafting.png b/src/main/resources/resources/gui/crafting.png
deleted file mode 100644
index da831189b..000000000
Binary files a/src/main/resources/resources/gui/crafting.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/enchant.png b/src/main/resources/resources/gui/enchant.png
deleted file mode 100644
index 0fddfd4c5..000000000
Binary files a/src/main/resources/resources/gui/enchant.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/furnace.png b/src/main/resources/resources/gui/furnace.png
deleted file mode 100644
index 8527289e5..000000000
Binary files a/src/main/resources/resources/gui/furnace.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/hotbar.png b/src/main/resources/resources/gui/hotbar.png
deleted file mode 100644
index 489e2dc51..000000000
Binary files a/src/main/resources/resources/gui/hotbar.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/icons.png b/src/main/resources/resources/gui/icons.png
deleted file mode 100644
index b382cc305..000000000
Binary files a/src/main/resources/resources/gui/icons.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/inventory.png b/src/main/resources/resources/gui/inventory.png
deleted file mode 100644
index 4d9911690..000000000
Binary files a/src/main/resources/resources/gui/inventory.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/items.png b/src/main/resources/resources/gui/items.png
deleted file mode 100644
index caf330e3d..000000000
Binary files a/src/main/resources/resources/gui/items.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/particles.png b/src/main/resources/resources/gui/particles.png
deleted file mode 100644
index 12d74536a..000000000
Binary files a/src/main/resources/resources/gui/particles.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/slot.png b/src/main/resources/resources/gui/slot.png
deleted file mode 100644
index 752b934c6..000000000
Binary files a/src/main/resources/resources/gui/slot.png and /dev/null differ
diff --git a/src/main/resources/resources/gui/trap.png b/src/main/resources/resources/gui/trap.png
deleted file mode 100644
index 594860a64..000000000
Binary files a/src/main/resources/resources/gui/trap.png and /dev/null differ
diff --git a/src/main/resources/resources/item/arrows.png b/src/main/resources/resources/item/arrows.png
deleted file mode 100644
index 75c582877..000000000
Binary files a/src/main/resources/resources/item/arrows.png and /dev/null differ
diff --git a/src/main/resources/resources/item/boat.png b/src/main/resources/resources/item/boat.png
deleted file mode 100644
index 132a0f7cb..000000000
Binary files a/src/main/resources/resources/item/boat.png and /dev/null differ
diff --git a/src/main/resources/resources/item/book.png b/src/main/resources/resources/item/book.png
deleted file mode 100644
index ae411ff20..000000000
Binary files a/src/main/resources/resources/item/book.png and /dev/null differ
diff --git a/src/main/resources/resources/item/cart.png b/src/main/resources/resources/item/cart.png
deleted file mode 100644
index ba73b60dd..000000000
Binary files a/src/main/resources/resources/item/cart.png and /dev/null differ
diff --git a/src/main/resources/resources/item/chest.png b/src/main/resources/resources/item/chest.png
deleted file mode 100644
index 7f5cd11b3..000000000
Binary files a/src/main/resources/resources/item/chest.png and /dev/null differ
diff --git a/src/main/resources/resources/item/door.png b/src/main/resources/resources/item/door.png
deleted file mode 100644
index 52df2d92d..000000000
Binary files a/src/main/resources/resources/item/door.png and /dev/null differ
diff --git a/src/main/resources/resources/item/largechest.png b/src/main/resources/resources/item/largechest.png
deleted file mode 100644
index 95700b3e8..000000000
Binary files a/src/main/resources/resources/item/largechest.png and /dev/null differ
diff --git a/src/main/resources/resources/item/sign.png b/src/main/resources/resources/item/sign.png
deleted file mode 100644
index f259e75fb..000000000
Binary files a/src/main/resources/resources/item/sign.png and /dev/null differ
diff --git a/src/main/resources/resources/item/xporb.png b/src/main/resources/resources/item/xporb.png
deleted file mode 100644
index 33670ee62..000000000
Binary files a/src/main/resources/resources/item/xporb.png and /dev/null differ
diff --git a/src/main/resources/resources/materials/block/liquid/lava/lava.spm b/src/main/resources/resources/materials/block/liquid/lava/lava.spm
deleted file mode 100644
index 73034f2cc..000000000
--- a/src/main/resources/resources/materials/block/liquid/lava/lava.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/liquid/lava/lava.uvs
-Material: material://Vanilla/resources/materials/terrainLiquid.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/liquid/water/water.spm b/src/main/resources/resources/materials/block/liquid/water/water.spm
deleted file mode 100644
index 7a5bf92ce..000000000
--- a/src/main/resources/resources/materials/block/liquid/water/water.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/liquid/water/water.uvs
-Material: material://Vanilla/resources/materials/terrainWater.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm b/src/main/resources/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm
deleted file mode 100644
index 471217d20..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/brownmushroom/brownmushroom.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/brownmushroom/brownmushroom.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/cactus/cactus.spm b/src/main/resources/resources/materials/block/nonsolid/cactus/cactus.spm
deleted file mode 100644
index 79afe73f9..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/cactus/cactus.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/cactus/cactus.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/dandelion/dandelion.spm b/src/main/resources/resources/materials/block/nonsolid/dandelion/dandelion.spm
deleted file mode 100644
index c7a95e796..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/dandelion/dandelion.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/dandelion/dandelion.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/deadgrass/deadgrass.spm b/src/main/resources/resources/materials/block/nonsolid/deadgrass/deadgrass.spm
deleted file mode 100644
index ae4ffe508..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/deadgrass/deadgrass.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/deadgrass/deadgrass.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/fern/fern.spm b/src/main/resources/resources/materials/block/nonsolid/fern/fern.spm
deleted file mode 100644
index c665dd157..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/fern/fern.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/fern/fern.obj
-Material: material://Vanilla/resources/materials/terrainTallGrass.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/redmushroom/redmushroom.spm b/src/main/resources/resources/materials/block/nonsolid/redmushroom/redmushroom.spm
deleted file mode 100644
index a1445f0be..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/redmushroom/redmushroom.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/redmushroom/redmushroom.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/rose/rose.spm b/src/main/resources/resources/materials/block/nonsolid/rose/rose.spm
deleted file mode 100644
index ca0f4b4df..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/rose/rose.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/rose/rose.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_1.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_1.spm
deleted file mode 100644
index 64b5b6970..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_1.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_1.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_2.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_2.spm
deleted file mode 100644
index 709a25c5b..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_2.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_2.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_3.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_3.spm
deleted file mode 100644
index d3e4ab659..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_3.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_3.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_4.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_4.spm
deleted file mode 100644
index c6c6a6f1e..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_4.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_4.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_5.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_5.spm
deleted file mode 100644
index 8cd63733e..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_5.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_5.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_6.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_6.spm
deleted file mode 100644
index 9a2d8ee4f..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_6.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_6.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/snow/snow_7.spm b/src/main/resources/resources/materials/block/nonsolid/snow/snow_7.spm
deleted file mode 100644
index 8e03e199a..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/snow/snow_7.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/snow/snow_7.obj
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/sugarcane/sugarcane.spm b/src/main/resources/resources/materials/block/nonsolid/sugarcane/sugarcane.spm
deleted file mode 100644
index 2bfb580ad..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/sugarcane/sugarcane.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/sugarcane/sugarcane.obj
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/tallgrass/tallgrass.spm b/src/main/resources/resources/materials/block/nonsolid/tallgrass/tallgrass.spm
deleted file mode 100644
index 0847e0909..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/tallgrass/tallgrass.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/tallgrass/tallgrass.obj
-Material: material://Vanilla/resources/materials/terrainTallGrass.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/nonsolid/vines/vines.spm b/src/main/resources/resources/materials/block/nonsolid/vines/vines.spm
deleted file mode 100644
index 17067dedc..000000000
--- a/src/main/resources/resources/materials/block/nonsolid/vines/vines.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: blockmesh://Vanilla/resources/materials/block/nonsolid/vines/vines.obj
-Material: material://Vanilla/resources/materials/terrainFoliage.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/bedrock/bedrock.spm b/src/main/resources/resources/materials/block/solid/bedrock/bedrock.spm
deleted file mode 100644
index 1fd455197..000000000
--- a/src/main/resources/resources/materials/block/solid/bedrock/bedrock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/bedrock/bedrock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/birchleaves/birchleaves.spm b/src/main/resources/resources/materials/block/solid/birchleaves/birchleaves.spm
deleted file mode 100644
index 673f47020..000000000
--- a/src/main/resources/resources/materials/block/solid/birchleaves/birchleaves.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/birchleaves/birchleaves.uvs
-Material: material://Vanilla/resources/materials/terrainFoliage.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/birchplanks/birchplanks.spm b/src/main/resources/resources/materials/block/solid/birchplanks/birchplanks.spm
deleted file mode 100644
index 70139f95c..000000000
--- a/src/main/resources/resources/materials/block/solid/birchplanks/birchplanks.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/birchplanks/birchplanks.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/birchwood/birchwood.spm b/src/main/resources/resources/materials/block/solid/birchwood/birchwood.spm
deleted file mode 100644
index 9fcda474a..000000000
--- a/src/main/resources/resources/materials/block/solid/birchwood/birchwood.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/birchwood/birchwood.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/blackwool/blackwool.spm b/src/main/resources/resources/materials/block/solid/blackwool/blackwool.spm
deleted file mode 100644
index f6fb784e1..000000000
--- a/src/main/resources/resources/materials/block/solid/blackwool/blackwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/blackwool/blackwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/bluewool/bluewool.spm b/src/main/resources/resources/materials/block/solid/bluewool/bluewool.spm
deleted file mode 100644
index 321f87fe8..000000000
--- a/src/main/resources/resources/materials/block/solid/bluewool/bluewool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/bluewool/bluewool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/bookshelf/bookshelf.spm b/src/main/resources/resources/materials/block/solid/bookshelf/bookshelf.spm
deleted file mode 100644
index 522d97675..000000000
--- a/src/main/resources/resources/materials/block/solid/bookshelf/bookshelf.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/bookshelf/bookshelf.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/bricks/bricks.spm b/src/main/resources/resources/materials/block/solid/bricks/bricks.spm
deleted file mode 100644
index 26ad2c2b4..000000000
--- a/src/main/resources/resources/materials/block/solid/bricks/bricks.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/bricks/bricks.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.spm b/src/main/resources/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.spm
deleted file mode 100644
index 638e402d3..000000000
--- a/src/main/resources/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/brownmushroomcap/brownmushroomcap.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.spm b/src/main/resources/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.spm
deleted file mode 100644
index 9ccfb4738..000000000
--- a/src/main/resources/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/brownmushroomtail/brownmushroomtail.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/brownwool/brownwool.spm b/src/main/resources/resources/materials/block/solid/brownwool/brownwool.spm
deleted file mode 100644
index 0c60903ec..000000000
--- a/src/main/resources/resources/materials/block/solid/brownwool/brownwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/brownwool/brownwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm b/src/main/resources/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm
deleted file mode 100644
index 845fa573a..000000000
--- a/src/main/resources/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/cheseledsandstone/cheseledsandstone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/circlestonebrick/circlestonebrick.spm b/src/main/resources/resources/materials/block/solid/circlestonebrick/circlestonebrick.spm
deleted file mode 100644
index 4d179a6e9..000000000
--- a/src/main/resources/resources/materials/block/solid/circlestonebrick/circlestonebrick.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/circlestonebrick/circlestonebrick.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/clayblock/clayblock.spm b/src/main/resources/resources/materials/block/solid/clayblock/clayblock.spm
deleted file mode 100644
index 2a7fb2ba7..000000000
--- a/src/main/resources/resources/materials/block/solid/clayblock/clayblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/clayblock/clayblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/coalore/coalore.spm b/src/main/resources/resources/materials/block/solid/coalore/coalore.spm
deleted file mode 100644
index 0fd183a9d..000000000
--- a/src/main/resources/resources/materials/block/solid/coalore/coalore.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/coalore/coalore.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/cobblestone/cobblestone.spm b/src/main/resources/resources/materials/block/solid/cobblestone/cobblestone.spm
deleted file mode 100644
index 61fc0f348..000000000
--- a/src/main/resources/resources/materials/block/solid/cobblestone/cobblestone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/cobblestone/cobblestone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm b/src/main/resources/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm
deleted file mode 100644
index 85a501765..000000000
--- a/src/main/resources/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/crackedstonebrick/crackedstonebrick.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/craftingtable/craftingtable.spm b/src/main/resources/resources/materials/block/solid/craftingtable/craftingtable.spm
deleted file mode 100644
index c09439f29..000000000
--- a/src/main/resources/resources/materials/block/solid/craftingtable/craftingtable.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/craftingtable/craftingtable.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/cyanwool/cyanwool.spm b/src/main/resources/resources/materials/block/solid/cyanwool/cyanwool.spm
deleted file mode 100644
index eb814a3c9..000000000
--- a/src/main/resources/resources/materials/block/solid/cyanwool/cyanwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/cyanwool/cyanwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/diamondblock/diamondblock.spm b/src/main/resources/resources/materials/block/solid/diamondblock/diamondblock.spm
deleted file mode 100644
index 1db3d84c9..000000000
--- a/src/main/resources/resources/materials/block/solid/diamondblock/diamondblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/diamondblock/diamondblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/diamondore/diamondore.spm b/src/main/resources/resources/materials/block/solid/diamondore/diamondore.spm
deleted file mode 100644
index 2bb9f37a9..000000000
--- a/src/main/resources/resources/materials/block/solid/diamondore/diamondore.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/diamondore/diamondore.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/dirt/dirt.spm b/src/main/resources/resources/materials/block/solid/dirt/dirt.spm
deleted file mode 100644
index b34ef0ac0..000000000
--- a/src/main/resources/resources/materials/block/solid/dirt/dirt.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/dirt/dirt.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/dispenser/dispenser.spm b/src/main/resources/resources/materials/block/solid/dispenser/dispenser.spm
deleted file mode 100644
index be116cf9c..000000000
--- a/src/main/resources/resources/materials/block/solid/dispenser/dispenser.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/dispenser/dispenser.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/doubleslabs/doubleslabs.spm b/src/main/resources/resources/materials/block/solid/doubleslabs/doubleslabs.spm
deleted file mode 100644
index ecdc20b07..000000000
--- a/src/main/resources/resources/materials/block/solid/doubleslabs/doubleslabs.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/doubleslabs/doubleslabs.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/endstone/endstone.spm b/src/main/resources/resources/materials/block/solid/endstone/endstone.spm
deleted file mode 100644
index 95385ff24..000000000
--- a/src/main/resources/resources/materials/block/solid/endstone/endstone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/endstone/endstone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/farmland/farmland.spm b/src/main/resources/resources/materials/block/solid/farmland/farmland.spm
deleted file mode 100644
index 7d6ae675e..000000000
--- a/src/main/resources/resources/materials/block/solid/farmland/farmland.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/farmland/farmland.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/furnace/furnace.spm b/src/main/resources/resources/materials/block/solid/furnace/furnace.spm
deleted file mode 100644
index f48824029..000000000
--- a/src/main/resources/resources/materials/block/solid/furnace/furnace.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/furnace/furnace.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/furnaceon/furnaceon.spm b/src/main/resources/resources/materials/block/solid/furnaceon/furnaceon.spm
deleted file mode 100644
index 8d2353653..000000000
--- a/src/main/resources/resources/materials/block/solid/furnaceon/furnaceon.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/furnaceon/furnaceon.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/glass/glass.spm b/src/main/resources/resources/materials/block/solid/glass/glass.spm
deleted file mode 100644
index 3972ecceb..000000000
--- a/src/main/resources/resources/materials/block/solid/glass/glass.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/glass/glass.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/glowstone/glowstone.spm b/src/main/resources/resources/materials/block/solid/glowstone/glowstone.spm
deleted file mode 100644
index 68e43c765..000000000
--- a/src/main/resources/resources/materials/block/solid/glowstone/glowstone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/glowstone/glowstone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/goldblock/goldblock.spm b/src/main/resources/resources/materials/block/solid/goldblock/goldblock.spm
deleted file mode 100644
index 49f5ede27..000000000
--- a/src/main/resources/resources/materials/block/solid/goldblock/goldblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/goldblock/goldblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/goldore/goldore.spm b/src/main/resources/resources/materials/block/solid/goldore/goldore.spm
deleted file mode 100644
index 01d582357..000000000
--- a/src/main/resources/resources/materials/block/solid/goldore/goldore.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/goldore/goldore.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/grass/grass.spm b/src/main/resources/resources/materials/block/solid/grass/grass.spm
deleted file mode 100644
index 68a5a8de9..000000000
--- a/src/main/resources/resources/materials/block/solid/grass/grass.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/grass/grass.uvs
-Material: material://Vanilla/resources/materials/terrainGrass.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/gravel/gravel.spm b/src/main/resources/resources/materials/block/solid/gravel/gravel.spm
deleted file mode 100644
index de59c77c0..000000000
--- a/src/main/resources/resources/materials/block/solid/gravel/gravel.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/gravel/gravel.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/graywool/graywool.spm b/src/main/resources/resources/materials/block/solid/graywool/graywool.spm
deleted file mode 100644
index b8c658de5..000000000
--- a/src/main/resources/resources/materials/block/solid/graywool/graywool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/graywool/graywool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/greenwool/greenwool.spm b/src/main/resources/resources/materials/block/solid/greenwool/greenwool.spm
deleted file mode 100644
index d5ec0c128..000000000
--- a/src/main/resources/resources/materials/block/solid/greenwool/greenwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/greenwool/greenwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/iceblock/iceblock.spm b/src/main/resources/resources/materials/block/solid/iceblock/iceblock.spm
deleted file mode 100644
index a18a7edca..000000000
--- a/src/main/resources/resources/materials/block/solid/iceblock/iceblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/iceblock/iceblock.uvs
-Material: material://Vanilla/resources/materials/terrainAlpha.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/iceblock/snowblock.spm b/src/main/resources/resources/materials/block/solid/iceblock/snowblock.spm
deleted file mode 100644
index 3e3f9e411..000000000
--- a/src/main/resources/resources/materials/block/solid/iceblock/snowblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/snowblock/snowblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/ironblock/ironblock.spm b/src/main/resources/resources/materials/block/solid/ironblock/ironblock.spm
deleted file mode 100644
index 1ccc13291..000000000
--- a/src/main/resources/resources/materials/block/solid/ironblock/ironblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/ironblock/ironblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/ironore/ironore.spm b/src/main/resources/resources/materials/block/solid/ironore/ironore.spm
deleted file mode 100644
index ee735b9b2..000000000
--- a/src/main/resources/resources/materials/block/solid/ironore/ironore.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/ironore/ironore.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/jackolantern/jackolantern.spm b/src/main/resources/resources/materials/block/solid/jackolantern/jackolantern.spm
deleted file mode 100644
index 5b8fc1148..000000000
--- a/src/main/resources/resources/materials/block/solid/jackolantern/jackolantern.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/jackolantern/jackolantern.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/jukebox/jukebox.spm b/src/main/resources/resources/materials/block/solid/jukebox/jukebox.spm
deleted file mode 100644
index 1b8807d5a..000000000
--- a/src/main/resources/resources/materials/block/solid/jukebox/jukebox.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/jukebox/jukebox.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/jungleleaves/jungleleaves.spm b/src/main/resources/resources/materials/block/solid/jungleleaves/jungleleaves.spm
deleted file mode 100644
index 44814e716..000000000
--- a/src/main/resources/resources/materials/block/solid/jungleleaves/jungleleaves.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/jungleleaves/jungleleaves.uvs
-Material: material://Vanilla/resources/materials/terrainFoliage.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/jungleplanks/jungleplanks.spm b/src/main/resources/resources/materials/block/solid/jungleplanks/jungleplanks.spm
deleted file mode 100644
index 87d74b179..000000000
--- a/src/main/resources/resources/materials/block/solid/jungleplanks/jungleplanks.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/jungleplanks/jungleplanks.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/junglewood/junglewood.spm b/src/main/resources/resources/materials/block/solid/junglewood/junglewood.spm
deleted file mode 100644
index 5e24e0f56..000000000
--- a/src/main/resources/resources/materials/block/solid/junglewood/junglewood.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/junglewood/junglewood.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm b/src/main/resources/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm
deleted file mode 100644
index 90ad0c4e4..000000000
--- a/src/main/resources/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/lapislazuliblock/lapislazuliblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm b/src/main/resources/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm
deleted file mode 100644
index a7625a083..000000000
--- a/src/main/resources/resources/materials/block/solid/lapislazuliore/lapislazuliore.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/lapislazuliore/lapislazuliore.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/lightbluewool/lightbluewool.spm b/src/main/resources/resources/materials/block/solid/lightbluewool/lightbluewool.spm
deleted file mode 100644
index f1ca134b3..000000000
--- a/src/main/resources/resources/materials/block/solid/lightbluewool/lightbluewool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/lightbluewool/lightbluewool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/lightgraywool/lightgraywool.spm b/src/main/resources/resources/materials/block/solid/lightgraywool/lightgraywool.spm
deleted file mode 100644
index c8a901ff6..000000000
--- a/src/main/resources/resources/materials/block/solid/lightgraywool/lightgraywool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/lightgraywool/lightgraywool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/lightgreenwool/lightgreenwool.spm b/src/main/resources/resources/materials/block/solid/lightgreenwool/lightgreenwool.spm
deleted file mode 100644
index c8e6e37e9..000000000
--- a/src/main/resources/resources/materials/block/solid/lightgreenwool/lightgreenwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/lightgreenwool/lightgreenwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/magentawool/magentawool.spm b/src/main/resources/resources/materials/block/solid/magentawool/magentawool.spm
deleted file mode 100644
index 06feed1ce..000000000
--- a/src/main/resources/resources/materials/block/solid/magentawool/magentawool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/magentawool/magentawool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/melon/melon.spm b/src/main/resources/resources/materials/block/solid/melon/melon.spm
deleted file mode 100644
index d060fe204..000000000
--- a/src/main/resources/resources/materials/block/solid/melon/melon.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/melon/melon.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/mobspawner/mobspawner.spm b/src/main/resources/resources/materials/block/solid/mobspawner/mobspawner.spm
deleted file mode 100644
index fdde23b63..000000000
--- a/src/main/resources/resources/materials/block/solid/mobspawner/mobspawner.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/mobspawner/mobspawner.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm b/src/main/resources/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm
deleted file mode 100644
index 9fa404170..000000000
--- a/src/main/resources/resources/materials/block/solid/mossycobblestone/mossycobblestone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/mossycobblestone/mossycobblestone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm b/src/main/resources/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm
deleted file mode 100644
index 7e571fc43..000000000
--- a/src/main/resources/resources/materials/block/solid/mossystonebrick/mossystonebrick.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/mossystonebrick/mossystonebrick.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/mycelium/mycelium.spm b/src/main/resources/resources/materials/block/solid/mycelium/mycelium.spm
deleted file mode 100644
index b51b22adc..000000000
--- a/src/main/resources/resources/materials/block/solid/mycelium/mycelium.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/mycelium/mycelium.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/netherbrick/netherbrick.spm b/src/main/resources/resources/materials/block/solid/netherbrick/netherbrick.spm
deleted file mode 100644
index e522b1a64..000000000
--- a/src/main/resources/resources/materials/block/solid/netherbrick/netherbrick.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/netherbrick/netherbrick.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/netherrack/netherrack.spm b/src/main/resources/resources/materials/block/solid/netherrack/netherrack.spm
deleted file mode 100644
index cd17817a4..000000000
--- a/src/main/resources/resources/materials/block/solid/netherrack/netherrack.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/netherrack/netherrack.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/noteblock/noteblock.spm b/src/main/resources/resources/materials/block/solid/noteblock/noteblock.spm
deleted file mode 100644
index bf462f8f0..000000000
--- a/src/main/resources/resources/materials/block/solid/noteblock/noteblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/noteblock/noteblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/oakleaves/oakleaves.spm b/src/main/resources/resources/materials/block/solid/oakleaves/oakleaves.spm
deleted file mode 100644
index 496a6716c..000000000
--- a/src/main/resources/resources/materials/block/solid/oakleaves/oakleaves.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/oakleaves/oakleaves.uvs
-Material: material://Vanilla/resources/materials/terrainFoliage.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/oakplanks/oakplanks.spm b/src/main/resources/resources/materials/block/solid/oakplanks/oakplanks.spm
deleted file mode 100644
index 24173c6a6..000000000
--- a/src/main/resources/resources/materials/block/solid/oakplanks/oakplanks.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/oakplanks/oakplanks.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/oakwood/oakwood.spm b/src/main/resources/resources/materials/block/solid/oakwood/oakwood.spm
deleted file mode 100644
index 711359d83..000000000
--- a/src/main/resources/resources/materials/block/solid/oakwood/oakwood.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/oakwood/oakwood.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/obsidian/obsidian.spm b/src/main/resources/resources/materials/block/solid/obsidian/obsidian.spm
deleted file mode 100644
index 8cb46e717..000000000
--- a/src/main/resources/resources/materials/block/solid/obsidian/obsidian.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/obsidian/obsidian.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/orangewool/orangewool.spm b/src/main/resources/resources/materials/block/solid/orangewool/orangewool.spm
deleted file mode 100644
index 56e9a03a3..000000000
--- a/src/main/resources/resources/materials/block/solid/orangewool/orangewool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/orangewool/orangewool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/pinkwool/pinkwool.spm b/src/main/resources/resources/materials/block/solid/pinkwool/pinkwool.spm
deleted file mode 100644
index a04df2b25..000000000
--- a/src/main/resources/resources/materials/block/solid/pinkwool/pinkwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/pinkwool/pinkwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/pumpkin/pumpkin.spm b/src/main/resources/resources/materials/block/solid/pumpkin/pumpkin.spm
deleted file mode 100644
index 7788cb43f..000000000
--- a/src/main/resources/resources/materials/block/solid/pumpkin/pumpkin.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/pumpkin/pumpkin.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/purplewool/purplewool.spm b/src/main/resources/resources/materials/block/solid/purplewool/purplewool.spm
deleted file mode 100644
index 93d004445..000000000
--- a/src/main/resources/resources/materials/block/solid/purplewool/purplewool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/purplewool/purplewool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/redmushroomcap/redmushroomcap.spm b/src/main/resources/resources/materials/block/solid/redmushroomcap/redmushroomcap.spm
deleted file mode 100644
index cc8570631..000000000
--- a/src/main/resources/resources/materials/block/solid/redmushroomcap/redmushroomcap.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/redmushroomcap/redmushroomcap.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/redmushroomtail/redmushroomtail.spm b/src/main/resources/resources/materials/block/solid/redmushroomtail/redmushroomtail.spm
deleted file mode 100644
index 1c57875f2..000000000
--- a/src/main/resources/resources/materials/block/solid/redmushroomtail/redmushroomtail.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/redmushroomtail/redmushroomtail.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm b/src/main/resources/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm
deleted file mode 100644
index e6b1f5049..000000000
--- a/src/main/resources/resources/materials/block/solid/redstonelampoff/redstonelampoff.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/redstonelampoff/redstonelampoff.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/redstonelampon/redstonelampon.spm b/src/main/resources/resources/materials/block/solid/redstonelampon/redstonelampon.spm
deleted file mode 100644
index f6af25d89..000000000
--- a/src/main/resources/resources/materials/block/solid/redstonelampon/redstonelampon.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/redstonelampon/redstonelampon.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/redstoneore/redstoneore.spm b/src/main/resources/resources/materials/block/solid/redstoneore/redstoneore.spm
deleted file mode 100644
index 5744bef0f..000000000
--- a/src/main/resources/resources/materials/block/solid/redstoneore/redstoneore.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/redstoneore/redstoneore.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/redwool/redwool.spm b/src/main/resources/resources/materials/block/solid/redwool/redwool.spm
deleted file mode 100644
index ca82eb038..000000000
--- a/src/main/resources/resources/materials/block/solid/redwool/redwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/redwool/redwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/sand/sand.spm b/src/main/resources/resources/materials/block/solid/sand/sand.spm
deleted file mode 100644
index 6307247f8..000000000
--- a/src/main/resources/resources/materials/block/solid/sand/sand.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/sand/sand.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/sandstone/sandstone.spm b/src/main/resources/resources/materials/block/solid/sandstone/sandstone.spm
deleted file mode 100644
index 5f98269ab..000000000
--- a/src/main/resources/resources/materials/block/solid/sandstone/sandstone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/sandstone/sandstone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm b/src/main/resources/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm
deleted file mode 100644
index 316894a33..000000000
--- a/src/main/resources/resources/materials/block/solid/smoothsandstone/smoothsandstone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/smoothsandstone/smoothsandstone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/snowblock/snowblock.spm b/src/main/resources/resources/materials/block/solid/snowblock/snowblock.spm
deleted file mode 100644
index 3e3f9e411..000000000
--- a/src/main/resources/resources/materials/block/solid/snowblock/snowblock.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/snowblock/snowblock.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/soulsand/soulsand.spm b/src/main/resources/resources/materials/block/solid/soulsand/soulsand.spm
deleted file mode 100644
index ee7e4b838..000000000
--- a/src/main/resources/resources/materials/block/solid/soulsand/soulsand.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/soulsand/soulsand.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/sponge/sponge.spm b/src/main/resources/resources/materials/block/solid/sponge/sponge.spm
deleted file mode 100644
index c227eead3..000000000
--- a/src/main/resources/resources/materials/block/solid/sponge/sponge.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/sponge/sponge.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/spruceleaves/spruceleaves.spm b/src/main/resources/resources/materials/block/solid/spruceleaves/spruceleaves.spm
deleted file mode 100644
index da5ca349b..000000000
--- a/src/main/resources/resources/materials/block/solid/spruceleaves/spruceleaves.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/spruceleaves/spruceleaves.uvs
-Material: material://Vanilla/resources/materials/terrainFoliage.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/spruceplanks/spruceplanks.spm b/src/main/resources/resources/materials/block/solid/spruceplanks/spruceplanks.spm
deleted file mode 100644
index bc855d8cf..000000000
--- a/src/main/resources/resources/materials/block/solid/spruceplanks/spruceplanks.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/spruceplanks/spruceplanks.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/sprucewood/sprucewood.spm b/src/main/resources/resources/materials/block/solid/sprucewood/sprucewood.spm
deleted file mode 100644
index 6dd18a51f..000000000
--- a/src/main/resources/resources/materials/block/solid/sprucewood/sprucewood.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/sprucewood/sprucewood.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/stone/stone.spm b/src/main/resources/resources/materials/block/solid/stone/stone.spm
deleted file mode 100644
index 0934f1ddc..000000000
--- a/src/main/resources/resources/materials/block/solid/stone/stone.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/stone/stone.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/stonebrick/stonebrick.spm b/src/main/resources/resources/materials/block/solid/stonebrick/stonebrick.spm
deleted file mode 100644
index 31ab52895..000000000
--- a/src/main/resources/resources/materials/block/solid/stonebrick/stonebrick.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/stonebrick/stonebrick.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/tnt/tnt.spm b/src/main/resources/resources/materials/block/solid/tnt/tnt.spm
deleted file mode 100644
index 4bb61070f..000000000
--- a/src/main/resources/resources/materials/block/solid/tnt/tnt.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/tnt/tnt.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/whitewool/whitewool.spm b/src/main/resources/resources/materials/block/solid/whitewool/whitewool.spm
deleted file mode 100644
index fabb86da5..000000000
--- a/src/main/resources/resources/materials/block/solid/whitewool/whitewool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/whitewool/whitewool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/block/solid/yellowwool/yellowwool.spm b/src/main/resources/resources/materials/block/solid/yellowwool/yellowwool.spm
deleted file mode 100644
index b9bd05bb0..000000000
--- a/src/main/resources/resources/materials/block/solid/yellowwool/yellowwool.spm
+++ /dev/null
@@ -1,2 +0,0 @@
-Mesh: cubemesh://Vanilla/resources/materials/block/solid/yellowwool/yellowwool.uvs
-Material: material://Vanilla/resources/materials/terrain.smt
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrain.smt b/src/main/resources/resources/materials/terrain.smt
deleted file mode 100644
index 82472a1d8..000000000
--- a/src/main/resources/resources/materials/terrain.smt
+++ /dev/null
@@ -1,4 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/terrain.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrainAlpha.smt b/src/main/resources/resources/materials/terrainAlpha.smt
deleted file mode 100644
index 51496e733..000000000
--- a/src/main/resources/resources/materials/terrainAlpha.smt
+++ /dev/null
@@ -1,7 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/terrainAlpha.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
-
-RenderState:
-    Layer: 2
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrainFoliage.smt b/src/main/resources/resources/materials/terrainFoliage.smt
deleted file mode 100644
index 053892821..000000000
--- a/src/main/resources/resources/materials/terrainFoliage.smt
+++ /dev/null
@@ -1,7 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/terrainFoliage.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
-
-RenderState:
-    Layer: 2
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrainGrass.smt b/src/main/resources/resources/materials/terrainGrass.smt
deleted file mode 100644
index 6fd58bab0..000000000
--- a/src/main/resources/resources/materials/terrainGrass.smt
+++ /dev/null
@@ -1,4 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/terrainGrass.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrainLiquid.smt b/src/main/resources/resources/materials/terrainLiquid.smt
deleted file mode 100644
index edc4d0c9a..000000000
--- a/src/main/resources/resources/materials/terrainLiquid.smt
+++ /dev/null
@@ -1,7 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/liquid.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
-
-RenderState:
-    Layer: 3
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrainTallGrass.smt b/src/main/resources/resources/materials/terrainTallGrass.smt
deleted file mode 100644
index 053892821..000000000
--- a/src/main/resources/resources/materials/terrainTallGrass.smt
+++ /dev/null
@@ -1,7 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/terrainFoliage.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
-
-RenderState:
-    Layer: 2
\ No newline at end of file
diff --git a/src/main/resources/resources/materials/terrainWater.smt b/src/main/resources/resources/materials/terrainWater.smt
deleted file mode 100644
index 1b403b61c..000000000
--- a/src/main/resources/resources/materials/terrainWater.smt
+++ /dev/null
@@ -1,7 +0,0 @@
-Shader: shader://Vanilla/resources/shaders/water.ssf
-
-MaterialParams:
-    Diffuse: texture://Vanilla/resources/terrain.png
-
-RenderState:
-    Layer: 3
\ No newline at end of file
diff --git a/src/main/resources/resources/misc/dial.png b/src/main/resources/resources/misc/dial.png
deleted file mode 100644
index 140e7e347..000000000
Binary files a/src/main/resources/resources/misc/dial.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/explosion.png b/src/main/resources/resources/misc/explosion.png
deleted file mode 100644
index 732069b3b..000000000
Binary files a/src/main/resources/resources/misc/explosion.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/foliagecolor.png b/src/main/resources/resources/misc/foliagecolor.png
deleted file mode 100644
index 2c880d155..000000000
Binary files a/src/main/resources/resources/misc/foliagecolor.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/footprint.png b/src/main/resources/resources/misc/footprint.png
deleted file mode 100644
index e29b6a6df..000000000
Binary files a/src/main/resources/resources/misc/footprint.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/glint.png b/src/main/resources/resources/misc/glint.png
deleted file mode 100644
index 67732093a..000000000
Binary files a/src/main/resources/resources/misc/glint.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/grasscolor.png b/src/main/resources/resources/misc/grasscolor.png
deleted file mode 100644
index 192904d98..000000000
Binary files a/src/main/resources/resources/misc/grasscolor.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/mapbg.png b/src/main/resources/resources/misc/mapbg.png
deleted file mode 100644
index 2ca6a9913..000000000
Binary files a/src/main/resources/resources/misc/mapbg.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/mapicons.png b/src/main/resources/resources/misc/mapicons.png
deleted file mode 100644
index 9f3252374..000000000
Binary files a/src/main/resources/resources/misc/mapicons.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/particlefield.png b/src/main/resources/resources/misc/particlefield.png
deleted file mode 100644
index c8c564151..000000000
Binary files a/src/main/resources/resources/misc/particlefield.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/pumpkinblur.png b/src/main/resources/resources/misc/pumpkinblur.png
deleted file mode 100644
index 29f30ddce..000000000
Binary files a/src/main/resources/resources/misc/pumpkinblur.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/shadow.png b/src/main/resources/resources/misc/shadow.png
deleted file mode 100644
index bfd5296a5..000000000
Binary files a/src/main/resources/resources/misc/shadow.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/tunnel.png b/src/main/resources/resources/misc/tunnel.png
deleted file mode 100644
index dc479e07d..000000000
Binary files a/src/main/resources/resources/misc/tunnel.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/vignette.png b/src/main/resources/resources/misc/vignette.png
deleted file mode 100644
index f236acb3c..000000000
Binary files a/src/main/resources/resources/misc/vignette.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/water.png b/src/main/resources/resources/misc/water.png
deleted file mode 100644
index dce48c911..000000000
Binary files a/src/main/resources/resources/misc/water.png and /dev/null differ
diff --git a/src/main/resources/resources/misc/watercolor.png b/src/main/resources/resources/misc/watercolor.png
deleted file mode 100644
index 858ef140b..000000000
Binary files a/src/main/resources/resources/misc/watercolor.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/cat_black.png b/src/main/resources/resources/mob/cat_black.png
deleted file mode 100644
index 028ffcd1d..000000000
Binary files a/src/main/resources/resources/mob/cat_black.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/cat_red.png b/src/main/resources/resources/mob/cat_red.png
deleted file mode 100644
index 5ca3fa1ea..000000000
Binary files a/src/main/resources/resources/mob/cat_red.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/cat_siamese.png b/src/main/resources/resources/mob/cat_siamese.png
deleted file mode 100644
index 70a88aedd..000000000
Binary files a/src/main/resources/resources/mob/cat_siamese.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/cavespider.png b/src/main/resources/resources/mob/cavespider.png
deleted file mode 100644
index 4f23903f1..000000000
Binary files a/src/main/resources/resources/mob/cavespider.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/chicken.png b/src/main/resources/resources/mob/chicken.png
deleted file mode 100644
index b54420706..000000000
Binary files a/src/main/resources/resources/mob/chicken.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/cow.png b/src/main/resources/resources/mob/cow.png
deleted file mode 100644
index fdc8a794d..000000000
Binary files a/src/main/resources/resources/mob/cow.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/beam.png b/src/main/resources/resources/mob/enderdragon/beam.png
deleted file mode 100644
index 60d6ea657..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/beam.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/body.png b/src/main/resources/resources/mob/enderdragon/body.png
deleted file mode 100644
index e604a7ce2..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/body.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/crystal.png b/src/main/resources/resources/mob/enderdragon/crystal.png
deleted file mode 100644
index 8686c29e4..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/crystal.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/dragon.png b/src/main/resources/resources/mob/enderdragon/dragon.png
deleted file mode 100644
index 6abddc828..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/dragon.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/ender.png b/src/main/resources/resources/mob/enderdragon/ender.png
deleted file mode 100644
index e0ad7e08f..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/ender.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/ender_eyes.png b/src/main/resources/resources/mob/enderdragon/ender_eyes.png
deleted file mode 100644
index 6d0c3c853..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/ender_eyes.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/enderdragon/shuffle.png b/src/main/resources/resources/mob/enderdragon/shuffle.png
deleted file mode 100644
index e13ed927c..000000000
Binary files a/src/main/resources/resources/mob/enderdragon/shuffle.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/fire.png b/src/main/resources/resources/mob/fire.png
deleted file mode 100644
index df7f8633b..000000000
Binary files a/src/main/resources/resources/mob/fire.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/ghast.png b/src/main/resources/resources/mob/ghast.png
deleted file mode 100644
index ea35250f2..000000000
Binary files a/src/main/resources/resources/mob/ghast.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/ghast_fire.png b/src/main/resources/resources/mob/ghast_fire.png
deleted file mode 100644
index 1a65746b3..000000000
Binary files a/src/main/resources/resources/mob/ghast_fire.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/lava.png b/src/main/resources/resources/mob/lava.png
deleted file mode 100644
index 3b4887aaf..000000000
Binary files a/src/main/resources/resources/mob/lava.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/ozelot.png b/src/main/resources/resources/mob/ozelot.png
deleted file mode 100644
index 7a0b8b390..000000000
Binary files a/src/main/resources/resources/mob/ozelot.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/pig.png b/src/main/resources/resources/mob/pig.png
deleted file mode 100644
index 5aab3da39..000000000
Binary files a/src/main/resources/resources/mob/pig.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/pigman.png b/src/main/resources/resources/mob/pigman.png
deleted file mode 100644
index 90e5f17af..000000000
Binary files a/src/main/resources/resources/mob/pigman.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/redcow.png b/src/main/resources/resources/mob/redcow.png
deleted file mode 100644
index b2e582217..000000000
Binary files a/src/main/resources/resources/mob/redcow.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/saddle.png b/src/main/resources/resources/mob/saddle.png
deleted file mode 100644
index 2bbce9e63..000000000
Binary files a/src/main/resources/resources/mob/saddle.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/sheep.png b/src/main/resources/resources/mob/sheep.png
deleted file mode 100644
index 38958dfc6..000000000
Binary files a/src/main/resources/resources/mob/sheep.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/sheep_fur.png b/src/main/resources/resources/mob/sheep_fur.png
deleted file mode 100644
index 08507a6d0..000000000
Binary files a/src/main/resources/resources/mob/sheep_fur.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/silverfish.png b/src/main/resources/resources/mob/silverfish.png
deleted file mode 100644
index ea35ec905..000000000
Binary files a/src/main/resources/resources/mob/silverfish.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/slime.png b/src/main/resources/resources/mob/slime.png
deleted file mode 100644
index 54bf157c5..000000000
Binary files a/src/main/resources/resources/mob/slime.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/snowman.png b/src/main/resources/resources/mob/snowman.png
deleted file mode 100644
index 9d49fb1e1..000000000
Binary files a/src/main/resources/resources/mob/snowman.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/spider.png b/src/main/resources/resources/mob/spider.png
deleted file mode 100644
index 1867784a5..000000000
Binary files a/src/main/resources/resources/mob/spider.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/spider_eyes.png b/src/main/resources/resources/mob/spider_eyes.png
deleted file mode 100644
index f3f751d62..000000000
Binary files a/src/main/resources/resources/mob/spider_eyes.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/squid.png b/src/main/resources/resources/mob/squid.png
deleted file mode 100644
index d273bf355..000000000
Binary files a/src/main/resources/resources/mob/squid.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager.png b/src/main/resources/resources/mob/villager.png
deleted file mode 100644
index 1a496f33b..000000000
Binary files a/src/main/resources/resources/mob/villager.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager/butcher.png b/src/main/resources/resources/mob/villager/butcher.png
deleted file mode 100644
index 0b7365422..000000000
Binary files a/src/main/resources/resources/mob/villager/butcher.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager/farmer.png b/src/main/resources/resources/mob/villager/farmer.png
deleted file mode 100644
index 671a4017c..000000000
Binary files a/src/main/resources/resources/mob/villager/farmer.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager/librarian.png b/src/main/resources/resources/mob/villager/librarian.png
deleted file mode 100644
index 598bb7cc1..000000000
Binary files a/src/main/resources/resources/mob/villager/librarian.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager/priest.png b/src/main/resources/resources/mob/villager/priest.png
deleted file mode 100644
index 39e3fde97..000000000
Binary files a/src/main/resources/resources/mob/villager/priest.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager/smith.png b/src/main/resources/resources/mob/villager/smith.png
deleted file mode 100644
index 8ba3ddb49..000000000
Binary files a/src/main/resources/resources/mob/villager/smith.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager/villager.png b/src/main/resources/resources/mob/villager/villager.png
deleted file mode 100644
index fa1ca4939..000000000
Binary files a/src/main/resources/resources/mob/villager/villager.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/villager_golem.png b/src/main/resources/resources/mob/villager_golem.png
deleted file mode 100644
index a853315e8..000000000
Binary files a/src/main/resources/resources/mob/villager_golem.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/wolf.png b/src/main/resources/resources/mob/wolf.png
deleted file mode 100644
index 3145eb2ae..000000000
Binary files a/src/main/resources/resources/mob/wolf.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/wolf_angry.png b/src/main/resources/resources/mob/wolf_angry.png
deleted file mode 100644
index e076ecb6b..000000000
Binary files a/src/main/resources/resources/mob/wolf_angry.png and /dev/null differ
diff --git a/src/main/resources/resources/mob/wolf_tame.png b/src/main/resources/resources/mob/wolf_tame.png
deleted file mode 100644
index 87936dfb0..000000000
Binary files a/src/main/resources/resources/mob/wolf_tame.png and /dev/null differ
diff --git a/src/main/resources/resources/particles.png b/src/main/resources/resources/particles.png
deleted file mode 100644
index de34f1b99..000000000
Binary files a/src/main/resources/resources/particles.png and /dev/null differ
diff --git a/src/main/resources/resources/shaders/liquid.ssf b/src/main/resources/resources/shaders/liquid.ssf
deleted file mode 100644
index 88c79ac2a..000000000
--- a/src/main/resources/resources/shaders/liquid.ssf
+++ /dev/null
@@ -1,7 +0,0 @@
-GL30:
-    Vertex: file://Vanilla/resources/shaders/liquid.330.vert
-    Fragment: file://Vanilla/resources/shaders/liquid.330.frag
-GL20:
-    Vertex: file://Vanilla/resources/shaders/liquid.120.vert
-    Fragment: file://Vanilla/resources/shaders/liquid.120.frag
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/shaders/terrain.ssf b/src/main/resources/resources/shaders/terrain.ssf
deleted file mode 100644
index 0a16c4e5f..000000000
--- a/src/main/resources/resources/shaders/terrain.ssf
+++ /dev/null
@@ -1,7 +0,0 @@
-GL30:
-    Vertex: file://Vanilla/resources/shaders/terrain.330.vert
-    Fragment: file://Vanilla/resources/shaders/terrain.330.frag
-GL20:
-    Vertex: file://Vanilla/resources/shaders/terrain.120.vert
-    Fragment: file://Vanilla/resources/shaders/terrain.120.frag
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/shaders/terrainAlpha.120.frag b/src/main/resources/resources/shaders/terrainAlpha.120.frag
deleted file mode 100644
index a12679eea..000000000
--- a/src/main/resources/resources/shaders/terrainAlpha.120.frag
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 120
-
-varying vec4 normal;
-varying vec4 color;
-varying vec2 uvcoord;
-
-uniform sampler2D Diffuse;
-
-void main()
-{
-    vec4 texel = texture2D(Diffuse, uvcoord);
-    if(texel.a <= 0.0f) discard;
-    gl_FragColor = texel * color;
-} 
\ No newline at end of file
diff --git a/src/main/resources/resources/shaders/terrainAlpha.ssf b/src/main/resources/resources/shaders/terrainAlpha.ssf
deleted file mode 100644
index ce942ea81..000000000
--- a/src/main/resources/resources/shaders/terrainAlpha.ssf
+++ /dev/null
@@ -1,7 +0,0 @@
-GL30:
-    Vertex: file://Vanilla/resources/shaders/terrain.330.vert
-    Fragment: file://Vanilla/resources/shaders/terrainAlpha.330.frag
-GL20:
-    Vertex: file://Vanilla/resources/shaders/terrain.120.vert
-    Fragment: file://Vanilla/resources/shaders/terrainAlpha.120.frag
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/shaders/terrainFoliage.ssf b/src/main/resources/resources/shaders/terrainFoliage.ssf
deleted file mode 100644
index f5a3ab7c2..000000000
--- a/src/main/resources/resources/shaders/terrainFoliage.ssf
+++ /dev/null
@@ -1,7 +0,0 @@
-GL30:
-    Vertex: file://Vanilla/resources/shaders/terrainBiomeColor.330.vert
-    Fragment: file://Vanilla/resources/shaders/terrainFoliage.330.frag
-GL20:
-    Vertex: file://Vanilla/resources/shaders/terrainBiomeColor.120.vert
-    Fragment: file://Vanilla/resources/shaders/terrainFoliage.120.frag
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/shaders/terrainGrass.ssf b/src/main/resources/resources/shaders/terrainGrass.ssf
deleted file mode 100644
index 677751981..000000000
--- a/src/main/resources/resources/shaders/terrainGrass.ssf
+++ /dev/null
@@ -1,6 +0,0 @@
-GL30:
-    Vertex: file://Vanilla/resources/shaders/terrainBiomeColor.330.vert
-    Fragment: file://Vanilla/resources/shaders/terrainGrass.330.frag
-GL20:
-    Vertex: file://Vanilla/resources/shaders/terrainBiomeColor.120.vert
-    Fragment: file://Vanilla/resources/shaders/terrainGrass.120.frag
diff --git a/src/main/resources/resources/shaders/water.ssf b/src/main/resources/resources/shaders/water.ssf
deleted file mode 100644
index fc544c79d..000000000
--- a/src/main/resources/resources/shaders/water.ssf
+++ /dev/null
@@ -1,7 +0,0 @@
-GL30:
-    Vertex: file://Vanilla/resources/shaders/water.330.vert
-    Fragment: file://Vanilla/resources/shaders/water.330.frag
-GL20:
-    Vertex: file://Vanilla/resources/shaders/water.120.vert
-    Fragment: file://Vanilla/resources/shaders/water.120.frag
-    
\ No newline at end of file
diff --git a/src/main/resources/resources/terrain.png b/src/main/resources/resources/terrain.png
deleted file mode 100644
index d8dbbf858..000000000
Binary files a/src/main/resources/resources/terrain.png and /dev/null differ
diff --git a/src/main/resources/resources/terrain/moon.png b/src/main/resources/resources/terrain/moon.png
deleted file mode 100644
index 61cebbc7e..000000000
Binary files a/src/main/resources/resources/terrain/moon.png and /dev/null differ
diff --git a/src/main/resources/resources/terrain/moon_phases.png b/src/main/resources/resources/terrain/moon_phases.png
deleted file mode 100644
index ce239ea7b..000000000
Binary files a/src/main/resources/resources/terrain/moon_phases.png and /dev/null differ
diff --git a/src/main/resources/resources/terrain/sun.png b/src/main/resources/resources/terrain/sun.png
deleted file mode 100644
index 43ba79a9a..000000000
Binary files a/src/main/resources/resources/terrain/sun.png and /dev/null differ
diff --git a/src/main/resources/resources/shaders/liquid.120.frag b/src/main/resources/shaders/liquid.120.frag
similarity index 50%
rename from src/main/resources/resources/shaders/liquid.120.frag
rename to src/main/resources/shaders/liquid.120.frag
index 7a9bef9bb..83988a660 100644
--- a/src/main/resources/resources/shaders/liquid.120.frag
+++ b/src/main/resources/shaders/liquid.120.frag
@@ -6,8 +6,7 @@ varying vec2 uvcoord;
 
 uniform sampler2D Diffuse;
 
-void main()
-{
-    vec4 fontsample = texture2D(Diffuse, uvcoord);
-    gl_FragColor = fontsample * color;
-} 
\ No newline at end of file
+void main() {
+	vec4 fontsample = texture2D(Diffuse, uvcoord);
+	gl_FragColor = fontsample * color;
+}
diff --git a/src/main/resources/resources/shaders/liquid.120.vert b/src/main/resources/shaders/liquid.120.vert
similarity index 88%
rename from src/main/resources/resources/shaders/liquid.120.vert
rename to src/main/resources/shaders/liquid.120.vert
index 3793c2aff..1f062b462 100644
--- a/src/main/resources/resources/shaders/liquid.120.vert
+++ b/src/main/resources/shaders/liquid.120.vert
@@ -20,18 +20,17 @@ uniform vec4 sunDir;
 uniform vec2 animation;
 uniform float ambient;
 
-void main()
-{
+void main() {
 	gl_Position = Projection * View * Model * vPosition;
 
 	vec3 L = normalize(sunDir.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
-	//calculate Ambient Term:
+	// calculate Ambient Term:
 	vec4 Iamb = skyColor * ambient * vskylight;
 
-	//calculate Diffuse Term:
+	// calculate Diffuse Term:
 	float dotProd = (1 + dot(vNormal.xyz,L)) / 2;
 	vec4 Idiff = (1 - ambient) * ((sunColor * max(dotProd, 0.0)) + (moonColor * max(1 - dotProd, 0.0)));
 	Idiff = clamp(Idiff * vskylight, 0.0, 1.0);
@@ -39,10 +38,9 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
 	normal = vNormal;
 	uvcoord = vTexCoord + animation;
-
-} 
+}
diff --git a/src/main/resources/resources/shaders/liquid.330.frag b/src/main/resources/shaders/liquid.330.frag
similarity index 76%
rename from src/main/resources/resources/shaders/liquid.330.frag
rename to src/main/resources/shaders/liquid.330.frag
index 2b86e9c9d..a18be50f8 100644
--- a/src/main/resources/resources/shaders/liquid.330.frag
+++ b/src/main/resources/shaders/liquid.330.frag
@@ -8,8 +8,7 @@ uniform sampler2D Diffuse;
 
 layout(location=0) out vec4 outputColor;
 
-void main()
-{
+void main() {
 	vec4 fontsample = texture(Diffuse, uvcoord);
-    outputColor = fontsample * color;
-} 
\ No newline at end of file
+	outputColor = fontsample * color;
+}
diff --git a/src/main/resources/resources/shaders/liquid.330.vert b/src/main/resources/shaders/liquid.330.vert
similarity index 92%
rename from src/main/resources/resources/shaders/liquid.330.vert
rename to src/main/resources/shaders/liquid.330.vert
index e3dfd0734..1b23ec508 100644
--- a/src/main/resources/resources/shaders/liquid.330.vert
+++ b/src/main/resources/shaders/liquid.330.vert
@@ -19,13 +19,12 @@ uniform vec4 skyColor;
 uniform vec4 sunDir;
 uniform vec2 animation;
 uniform float ambient;
-		
-void main()
-{
+
+void main() {
 	gl_Position = Projection * View * Model * vPosition;
-	
+
 	vec3 L = normalize(sunDir.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
 	//calculate Ambient Term:
@@ -39,10 +38,9 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
 	normal = vNormal;
 	uvcoord = vTexCoord + animation;
-
-} 
+}
diff --git a/src/main/resources/shaders/liquid.ssf b/src/main/resources/shaders/liquid.ssf
new file mode 100644
index 000000000..d07a15749
--- /dev/null
+++ b/src/main/resources/shaders/liquid.ssf
@@ -0,0 +1,6 @@
+GL30:
+    Vertex: file://Vanilla/shaders/liquid.330.vert
+    Fragment: file://Vanilla/shaders/liquid.330.frag
+GL20:
+    Vertex: file://Vanilla/shaders/liquid.120.vert
+    Fragment: file://Vanilla/shaders/liquid.120.frag
diff --git a/src/main/resources/resources/shaders/terrain.120.frag b/src/main/resources/shaders/terrain.120.frag
similarity index 50%
rename from src/main/resources/resources/shaders/terrain.120.frag
rename to src/main/resources/shaders/terrain.120.frag
index b40f399c4..9ef0e26cb 100644
--- a/src/main/resources/resources/shaders/terrain.120.frag
+++ b/src/main/resources/shaders/terrain.120.frag
@@ -6,8 +6,7 @@ varying vec2 uvcoord;
 
 uniform sampler2D Diffuse;
 
-void main()
-{
-    vec4 fontsample = texture2D(Diffuse, uvcoord);
-    gl_FragColor = fontsample * color;
-} 
\ No newline at end of file
+void main() {
+	vec4 fontsample = texture2D(Diffuse, uvcoord);
+	gl_FragColor = fontsample * color;
+}
diff --git a/src/main/resources/resources/shaders/terrain.120.vert b/src/main/resources/shaders/terrain.120.vert
similarity index 91%
rename from src/main/resources/resources/shaders/terrain.120.vert
rename to src/main/resources/shaders/terrain.120.vert
index 149f63004..218f1ac0d 100644
--- a/src/main/resources/resources/shaders/terrain.120.vert
+++ b/src/main/resources/shaders/terrain.120.vert
@@ -1,5 +1,5 @@
 #version 120
-	
+
 attribute vec4 vPosition;
 attribute float vlight;
 attribute vec4 vNormal;
@@ -18,13 +18,12 @@ uniform vec4 moonColor;
 uniform vec4 skyColor;
 uniform vec4 sunDir;
 uniform float ambient;
-		
-void main()
-{
+
+void main() {
 	gl_Position = Projection * View  * Model * vPosition;
-	
+
 	vec3 L = normalize(sunDir.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
 	//calculate Ambient Term:
@@ -38,9 +37,9 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
-	
+
 	uvcoord = vTexCoord;
-} 
+}
diff --git a/src/main/resources/resources/shaders/terrain.330.frag b/src/main/resources/shaders/terrain.330.frag
similarity index 76%
rename from src/main/resources/resources/shaders/terrain.330.frag
rename to src/main/resources/shaders/terrain.330.frag
index 9d2069fa5..66e27f899 100644
--- a/src/main/resources/resources/shaders/terrain.330.frag
+++ b/src/main/resources/shaders/terrain.330.frag
@@ -8,8 +8,7 @@ uniform sampler2D Diffuse;
 
 layout(location=0) out vec4 outputColor;
 
-void main()
-{
+void main() {
 	vec4 fontsample = texture(Diffuse, uvcoord);
-    outputColor = fontsample * color;
-} 
\ No newline at end of file
+	outputColor = fontsample * color;
+}
diff --git a/src/main/resources/resources/shaders/terrain.330.vert b/src/main/resources/shaders/terrain.330.vert
similarity index 92%
rename from src/main/resources/resources/shaders/terrain.330.vert
rename to src/main/resources/shaders/terrain.330.vert
index 62860414b..23a8eee07 100644
--- a/src/main/resources/resources/shaders/terrain.330.vert
+++ b/src/main/resources/shaders/terrain.330.vert
@@ -19,14 +19,13 @@ uniform vec4 skyColor;
 uniform vec4 sunDir;
 uniform float ambient;
 
-void main()
-{
+void main() {
 	gl_Position = Projection * View * Model * vPosition;
 
 	normal = vNormal;
-	
+
 	vec3 L = normalize(sunDir.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
 	//calculate Ambient Term:
@@ -40,10 +39,9 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
-	
-	uvcoord = vTexCoord;
 
+	uvcoord = vTexCoord;
 }
diff --git a/src/main/resources/shaders/terrain.ssf b/src/main/resources/shaders/terrain.ssf
new file mode 100644
index 000000000..71ad5b8d1
--- /dev/null
+++ b/src/main/resources/shaders/terrain.ssf
@@ -0,0 +1,6 @@
+GL30:
+    Vertex: file://Vanilla/shaders/terrain.330.vert
+    Fragment: file://Vanilla/shaders/terrain.330.frag
+GL20:
+    Vertex: file://Vanilla/shaders/terrain.120.vert
+    Fragment: file://Vanilla/shaders/terrain.120.frag
diff --git a/src/main/resources/shaders/terrainAlpha.120.frag b/src/main/resources/shaders/terrainAlpha.120.frag
new file mode 100644
index 000000000..375a46a2e
--- /dev/null
+++ b/src/main/resources/shaders/terrainAlpha.120.frag
@@ -0,0 +1,13 @@
+#version 120
+
+varying vec4 normal;
+varying vec4 color;
+varying vec2 uvcoord;
+
+uniform sampler2D Diffuse;
+
+void main() {
+	vec4 texel = texture2D(Diffuse, uvcoord);
+	if(texel.a <= 0.0f) discard;
+	gl_FragColor = texel * color;
+}
diff --git a/src/main/resources/resources/shaders/terrainAlpha.330.frag b/src/main/resources/shaders/terrainAlpha.330.frag
similarity index 80%
rename from src/main/resources/resources/shaders/terrainAlpha.330.frag
rename to src/main/resources/shaders/terrainAlpha.330.frag
index 1a59872ca..6a4452f7f 100644
--- a/src/main/resources/resources/shaders/terrainAlpha.330.frag
+++ b/src/main/resources/shaders/terrainAlpha.330.frag
@@ -8,9 +8,8 @@ uniform sampler2D Diffuse;
 
 layout(location=0) out vec4 outputColor;
 
-void main()
-{
+void main() {
 	vec4 texel = texture(Diffuse, uvcoord);
 	if(texel.a <= 0.0f) discard;
-    outputColor = texel * color;
-} 
\ No newline at end of file
+	outputColor = texel * color;
+}
diff --git a/src/main/resources/shaders/terrainAlpha.ssf b/src/main/resources/shaders/terrainAlpha.ssf
new file mode 100644
index 000000000..8b6997735
--- /dev/null
+++ b/src/main/resources/shaders/terrainAlpha.ssf
@@ -0,0 +1,6 @@
+GL30:
+    Vertex: file://Vanilla/shaders/terrain.330.vert
+    Fragment: file://Vanilla/shaders/terrainAlpha.330.frag
+GL20:
+    Vertex: file://Vanilla/shaders/terrain.120.vert
+    Fragment: file://Vanilla/shaders/terrainAlpha.120.frag
diff --git a/src/main/resources/resources/shaders/terrainBiomeColor.120.vert b/src/main/resources/shaders/terrainBiomeColor.120.vert
similarity index 92%
rename from src/main/resources/resources/shaders/terrainBiomeColor.120.vert
rename to src/main/resources/shaders/terrainBiomeColor.120.vert
index 045376a88..a5a8ea74c 100644
--- a/src/main/resources/resources/shaders/terrainBiomeColor.120.vert
+++ b/src/main/resources/shaders/terrainBiomeColor.120.vert
@@ -1,5 +1,5 @@
 #version 120
-	
+
 attribute vec4 vPosition;
 attribute float vlight;
 attribute vec4 vNormal;
@@ -20,15 +20,14 @@ uniform vec4 moonColor;
 uniform vec4 skyColor;
 uniform vec4 sunDir;
 uniform float ambient;
-		
-void main()
-{
+
+void main() {
 	gl_Position = Projection * View  * Model * vPosition;
-	
+
 	normal = vNormal;
-	
+
 	vec3 L = normalize(sunDir.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
 	//calculate Ambient Term:
@@ -42,11 +41,11 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
-	
+
 	uvcoord = vTexCoord;
-	
+
 	biomecolor = vBiomeColor;
 }
diff --git a/src/main/resources/resources/shaders/terrainBiomeColor.330.vert b/src/main/resources/shaders/terrainBiomeColor.330.vert
similarity index 92%
rename from src/main/resources/resources/shaders/terrainBiomeColor.330.vert
rename to src/main/resources/shaders/terrainBiomeColor.330.vert
index 951798ed7..241b00343 100644
--- a/src/main/resources/resources/shaders/terrainBiomeColor.330.vert
+++ b/src/main/resources/shaders/terrainBiomeColor.330.vert
@@ -21,14 +21,13 @@ uniform vec4 skyColor;
 uniform vec4 sunDir;
 uniform float ambient;
 
-void main()
-{
+void main() {
 	gl_Position = Projection * View * Model * vPosition;
 
 	normal = vNormal;
-	
+
 	vec3 L = normalize(sunDir.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
 	//calculate Ambient Term:
@@ -42,12 +41,11 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
-	
+
 	uvcoord = vTexCoord;
-	
-	biomecolor = vBiomeColor;
 
+	biomecolor = vBiomeColor;
 }
diff --git a/src/main/resources/resources/shaders/terrainFoliage.120.frag b/src/main/resources/shaders/terrainFoliage.120.frag
similarity index 93%
rename from src/main/resources/resources/shaders/terrainFoliage.120.frag
rename to src/main/resources/shaders/terrainFoliage.120.frag
index 4d4e95fac..7bf4c1dbe 100644
--- a/src/main/resources/resources/shaders/terrainFoliage.120.frag
+++ b/src/main/resources/shaders/terrainFoliage.120.frag
@@ -7,9 +7,8 @@ varying vec2 uvcoord;
 
 uniform sampler2D Diffuse;
 
-void main()
-{
+void main() {
 	vec4 texel = texture2D(Diffuse, uvcoord);
 	if (texel.a <= 0.0f) discard;
 	gl_FragColor = texel * color * biomecolor;
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/resources/shaders/terrainFoliage.330.frag b/src/main/resources/shaders/terrainFoliage.330.frag
similarity index 94%
rename from src/main/resources/resources/shaders/terrainFoliage.330.frag
rename to src/main/resources/shaders/terrainFoliage.330.frag
index 9eda4fcb1..826d5299d 100644
--- a/src/main/resources/resources/shaders/terrainFoliage.330.frag
+++ b/src/main/resources/shaders/terrainFoliage.330.frag
@@ -9,9 +9,8 @@ uniform sampler2D Diffuse;
 
 layout(location=0) out vec4 outputColor;
 
-void main()
-{
+void main() {
 	vec4 texel = texture(Diffuse, uvcoord);
 	if (texel.a <= 0.0f) discard;
 	outputColor = texel * color * biomecolor;
-} 
\ No newline at end of file
+}
diff --git a/src/main/resources/shaders/terrainFoliage.ssf b/src/main/resources/shaders/terrainFoliage.ssf
new file mode 100644
index 000000000..9bce7c6e6
--- /dev/null
+++ b/src/main/resources/shaders/terrainFoliage.ssf
@@ -0,0 +1,6 @@
+GL30:
+    Vertex: file://Vanilla/shaders/terrainBiomeColor.330.vert
+    Fragment: file://Vanilla/shaders/terrainFoliage.330.frag
+GL20:
+    Vertex: file://Vanilla/shaders/terrainBiomeColor.120.vert
+    Fragment: file://Vanilla/shaders/terrainFoliage.120.frag
diff --git a/src/main/resources/resources/shaders/terrainGrass.120.frag b/src/main/resources/shaders/terrainGrass.120.frag
similarity index 97%
rename from src/main/resources/resources/shaders/terrainGrass.120.frag
rename to src/main/resources/shaders/terrainGrass.120.frag
index fe758e3e6..b979bf9b7 100644
--- a/src/main/resources/resources/shaders/terrainGrass.120.frag
+++ b/src/main/resources/shaders/terrainGrass.120.frag
@@ -7,8 +7,7 @@ varying vec2 uvcoord;
 
 uniform sampler2D Diffuse;
 
-void main()
-{
+void main() {
 	if (normal.y < 0) {
 		// Bottom face
 		gl_FragColor = texture2D(Diffuse, uvcoord) * color;
@@ -24,4 +23,4 @@ void main()
 		// Top face
 		gl_FragColor = texture2D(Diffuse, uvcoord) * color * biomecolor;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/resources/shaders/terrainGrass.330.frag b/src/main/resources/shaders/terrainGrass.330.frag
similarity index 97%
rename from src/main/resources/resources/shaders/terrainGrass.330.frag
rename to src/main/resources/shaders/terrainGrass.330.frag
index 9243ddb45..10ef527d2 100644
--- a/src/main/resources/resources/shaders/terrainGrass.330.frag
+++ b/src/main/resources/shaders/terrainGrass.330.frag
@@ -9,8 +9,7 @@ uniform sampler2D Diffuse;
 
 layout(location=0) out vec4 outputColor;
 
-void main()
-{
+void main() {
 	if (normal.y < 0) {
 		// Bottom face
 		outputColor = texture(Diffuse, uvcoord) * color;
@@ -26,4 +25,4 @@ void main()
 		// Top face
 		outputColor = texture(Diffuse, uvcoord) * color * biomecolor;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/shaders/terrainGrass.ssf b/src/main/resources/shaders/terrainGrass.ssf
new file mode 100644
index 000000000..385a5bede
--- /dev/null
+++ b/src/main/resources/shaders/terrainGrass.ssf
@@ -0,0 +1,6 @@
+GL30:
+    Vertex: file://Vanilla/shaders/terrainBiomeColor.330.vert
+    Fragment: file://Vanilla/shaders/terrainGrass.330.frag
+GL20:
+    Vertex: file://Vanilla/shaders/terrainBiomeColor.120.vert
+    Fragment: file://Vanilla/shaders/terrainGrass.120.frag
diff --git a/src/main/resources/resources/shaders/water.120.frag b/src/main/resources/shaders/water.120.frag
similarity index 52%
rename from src/main/resources/resources/shaders/water.120.frag
rename to src/main/resources/shaders/water.120.frag
index 70c6c8a41..3866b2d23 100644
--- a/src/main/resources/resources/shaders/water.120.frag
+++ b/src/main/resources/shaders/water.120.frag
@@ -7,8 +7,7 @@ varying vec2 uvcoord;
 
 uniform sampler2D Diffuse;
 
-void main()
-{
-    vec4 fontsample = texture2D(Diffuse, uvcoord);
-    gl_FragColor = fontsample * color * biomeColor;
-} 
\ No newline at end of file
+void main() {
+	vec4 fontsample = texture2D(Diffuse, uvcoord);
+	gl_FragColor = fontsample * color * biomeColor;
+}
diff --git a/src/main/resources/resources/shaders/water.120.vert b/src/main/resources/shaders/water.120.vert
similarity index 88%
rename from src/main/resources/resources/shaders/water.120.vert
rename to src/main/resources/shaders/water.120.vert
index 016334a8c..f52dfd2a3 100644
--- a/src/main/resources/resources/shaders/water.120.vert
+++ b/src/main/resources/shaders/water.120.vert
@@ -22,18 +22,17 @@ uniform vec4 sunDir;
 uniform vec2 animation;
 uniform float ambient;
 
-void main()
-{
+void main() {
 	gl_Position = Projection * View  * Model * vPosition;
 
 	vec3 L = normalize(sunDir.xyz - vPosition.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
-	//calculate Ambient Term:
+	// calculate Ambient Term:
 	vec4 Iamb = skyColor * ambient * vskylight;
 
-	//calculate Diffuse Term:
+	// calculate Diffuse Term:
 	float dotProd = (1 + dot(vNormal.xyz,L)) / 2;
 	vec4 Idiff = (1 - ambient) * ((sunColor * max(dotProd, 0.0)) + (moonColor * max(1 - dotProd, 0.0)));
 	Idiff = clamp(Idiff * vskylight, 0.0, 1.0);
@@ -41,11 +40,10 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
 	biomeColor = vBiomeColor;
 	normal = vNormal;
 	uvcoord = vTexCoord + animation;
-
-} 
+}
diff --git a/src/main/resources/resources/shaders/water.330.frag b/src/main/resources/shaders/water.330.frag
similarity index 74%
rename from src/main/resources/resources/shaders/water.330.frag
rename to src/main/resources/shaders/water.330.frag
index 34d1876f7..e51e09e4e 100644
--- a/src/main/resources/resources/shaders/water.330.frag
+++ b/src/main/resources/shaders/water.330.frag
@@ -9,8 +9,7 @@ uniform sampler2D Diffuse;
 
 layout(location=0) out vec4 outputColor;
 
-void main()
-{
+void main() {
 	vec4 fontsample = texture(Diffuse, uvcoord);
-    outputColor = fontsample * color * biomeColor;
-} 
\ No newline at end of file
+	outputColor = fontsample * color * biomeColor;
+}
diff --git a/src/main/resources/resources/shaders/water.330.vert b/src/main/resources/shaders/water.330.vert
similarity index 89%
rename from src/main/resources/resources/shaders/water.330.vert
rename to src/main/resources/shaders/water.330.vert
index 7f237ce59..374c372fc 100644
--- a/src/main/resources/resources/shaders/water.330.vert
+++ b/src/main/resources/shaders/water.330.vert
@@ -21,19 +21,18 @@ uniform vec4 skyColor;
 uniform vec4 sunDir;
 uniform vec2 animation;
 uniform float ambient;
-		
-void main()
-{
+
+void main() {
 	gl_Position = Projection * View * Model * vPosition;
-	
+
 	vec3 L = normalize(sunDir.xyz - vPosition.xyz);
-	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)  
+	vec3 E = normalize(-vPosition.xyz); // we are in Eye Coordinates, so EyePos is (0,0,0)
 	vec3 R = normalize(-reflect(L,vNormal.xyz));
 
-	//calculate Ambient Term:
+	// calculate Ambient Term:
 	vec4 Iamb = skyColor * ambient * vskylight;
 
-	//calculate Diffuse Term:
+	// calculate Diffuse Term:
 	float dotProd = (1 + dot(vNormal.xyz,L)) / 2;
 	vec4 Idiff = (1 - ambient) * ((sunColor * max(dotProd, 0.0)) + (moonColor * max(1 - dotProd, 0.0)));
 	Idiff = clamp(Idiff * vskylight, 0.0, 1.0);
@@ -41,11 +40,10 @@ void main()
 	// calculate Specular Term:
 	// float shininess = 0.1;
 	// vec4 Ispec = skyColor * 0.3 * pow(max(dot(R,E),0.0),0.3 * shininess);
-	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0); 
+	// Ispec = clamp(Ispec * vskylight, 0.0, 1.0);
 
 	color = vec4(vlight, vlight, vlight, 1) + Iamb + Idiff;
 	biomeColor = vBiomeColor;
 	normal = vNormal;
 	uvcoord = vTexCoord + animation;
-
-} 
+}
diff --git a/src/main/resources/shaders/water.ssf b/src/main/resources/shaders/water.ssf
new file mode 100644
index 000000000..1c300a9e6
--- /dev/null
+++ b/src/main/resources/shaders/water.ssf
@@ -0,0 +1,6 @@
+GL30:
+    Vertex: file://Vanilla/shaders/water.330.vert
+    Fragment: file://Vanilla/shaders/water.330.frag
+GL20:
+    Vertex: file://Vanilla/shaders/water.120.vert
+    Fragment: file://Vanilla/shaders/water.120.frag
diff --git a/src/main/resources/terrain.png b/src/main/resources/terrain.png
new file mode 100644
index 000000000..ac9754cce
Binary files /dev/null and b/src/main/resources/terrain.png differ
diff --git a/src/main/resources/terrain/moon.png b/src/main/resources/terrain/moon.png
new file mode 100644
index 000000000..ea7cc33ac
Binary files /dev/null and b/src/main/resources/terrain/moon.png differ
diff --git a/src/main/resources/terrain/moon_phases.png b/src/main/resources/terrain/moon_phases.png
new file mode 100644
index 000000000..0a0c32e6f
Binary files /dev/null and b/src/main/resources/terrain/moon_phases.png differ
diff --git a/src/main/resources/terrain/sun.png b/src/main/resources/terrain/sun.png
new file mode 100644
index 000000000..78db37c55
Binary files /dev/null and b/src/main/resources/terrain/sun.png differ
diff --git a/src/test/java/org/spout/vanilla/EngineFaker.java b/src/test/java/org/spout/vanilla/EngineFaker.java
index a10fdc766..7dc79583d 100644
--- a/src/test/java/org/spout/vanilla/EngineFaker.java
+++ b/src/test/java/org/spout/vanilla/EngineFaker.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla;
 
diff --git a/src/test/java/org/spout/vanilla/StaticInitialisationOrderTest.java b/src/test/java/org/spout/vanilla/StaticInitialisationOrderTest.java
index 7e6362dd3..1f6abaada 100755
--- a/src/test/java/org/spout/vanilla/StaticInitialisationOrderTest.java
+++ b/src/test/java/org/spout/vanilla/StaticInitialisationOrderTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla;
 
diff --git a/src/test/java/org/spout/vanilla/chat/style/VanillaStyleHandlerTest.java b/src/test/java/org/spout/vanilla/chat/style/VanillaStyleHandlerTest.java
index cb289be36..0c3fcee42 100644
--- a/src/test/java/org/spout/vanilla/chat/style/VanillaStyleHandlerTest.java
+++ b/src/test/java/org/spout/vanilla/chat/style/VanillaStyleHandlerTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.chat.style;
 
diff --git a/src/test/java/org/spout/vanilla/inventory/util/InventoryConverterTest.java b/src/test/java/org/spout/vanilla/inventory/util/InventoryConverterTest.java
index 6563ffeea..519087d64 100644
--- a/src/test/java/org/spout/vanilla/inventory/util/InventoryConverterTest.java
+++ b/src/test/java/org/spout/vanilla/inventory/util/InventoryConverterTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 /*package org.spout.vanilla.inventory.util;
 
diff --git a/src/test/java/org/spout/vanilla/item/DamageTest.java b/src/test/java/org/spout/vanilla/item/DamageTest.java
index 1409cde45..6925b9b86 100644
--- a/src/test/java/org/spout/vanilla/item/DamageTest.java
+++ b/src/test/java/org/spout/vanilla/item/DamageTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.item;
 
diff --git a/src/test/java/org/spout/vanilla/protocol/BaseProtocolTest.java b/src/test/java/org/spout/vanilla/protocol/BaseProtocolTest.java
index eca54cd64..415e0cd7e 100644
--- a/src/test/java/org/spout/vanilla/protocol/BaseProtocolTest.java
+++ b/src/test/java/org/spout/vanilla/protocol/BaseProtocolTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/test/java/org/spout/vanilla/protocol/ChannelBufferUtilsTest.java b/src/test/java/org/spout/vanilla/protocol/ChannelBufferUtilsTest.java
index c47f67238..176ace892 100644
--- a/src/test/java/org/spout/vanilla/protocol/ChannelBufferUtilsTest.java
+++ b/src/test/java/org/spout/vanilla/protocol/ChannelBufferUtilsTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;
 
diff --git a/src/test/java/org/spout/vanilla/protocol/VanillaProtocolTest.java b/src/test/java/org/spout/vanilla/protocol/VanillaProtocolTest.java
index 167b798ec..428b0d7d9 100644
--- a/src/test/java/org/spout/vanilla/protocol/VanillaProtocolTest.java
+++ b/src/test/java/org/spout/vanilla/protocol/VanillaProtocolTest.java
@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.protocol;