diff --git a/common/src/common/world/CloudType.java b/common/src/common/dimension/CloudType.java
similarity index 96%
rename from common/src/common/world/CloudType.java
rename to common/src/common/dimension/CloudType.java
index e3ccbd9..a3f1b14 100644
--- a/common/src/common/world/CloudType.java
+++ b/common/src/common/dimension/CloudType.java
@@ -1,4 +1,4 @@
-package common.world;
+package common.dimension;
 
 import java.util.Map;
 
diff --git a/common/src/common/dimension/Dimension.java b/common/src/common/dimension/Dimension.java
index 9eee678..97302ef 100755
--- a/common/src/common/dimension/Dimension.java
+++ b/common/src/common/dimension/Dimension.java
@@ -16,8 +16,6 @@ import common.nbt.NBTTagList;
 import common.nbt.NBTTagString;
 import common.util.ExtMath;
 import common.util.Vec3;
-import common.world.CloudType;
-import common.world.SkyboxType;
 import common.world.State;
 import common.world.Weather;
 
@@ -41,59 +39,6 @@ public abstract class Dimension extends Nameable implements Comparable<Dimension
 	    public float biomeScaleOffset = 0.0F;
 	}
 	
-//	public static class FlatSettings {
-//		public IBlockState state;
-//	    public int height;
-//		
-//		public FlatSettings(IBlockState block) {
-//			this.state = block;
-//		}
-//	}
-	
-//	public static class OreSettings {
-//		public IBlockState state;
-//	    public boolean distrib;
-//	    public int size;
-//	    public int count;
-//	    public int addCount;
-//	    public int minHeight;
-//	    public int maxHeight;
-//		
-//		public OreSettings(IBlockState block, boolean distrib, int size, int count, int addCount, int minCenter, int maxSpread) {
-//			this.state = block;
-//			this.distrib = distrib;
-//			this.size = size;
-//			this.count = count;
-//			this.addCount = addCount;
-//			this.minHeight = minCenter;
-//			this.maxHeight = maxSpread;
-//		}
-//		
-//		public OreSettings(IBlockState block, boolean distrib, int size, int count, int minCenter, int maxSpread) {
-//			this(block, distrib, size, count, 0, minCenter, maxSpread);
-//		}
-//		
-//		public OreSettings(IBlockState block, int size, int count, int divAdd, int min, int max) {
-//			this(block, false, size, count, divAdd, min, max);
-//		}
-//		
-//		public OreSettings(IBlockState block, int size, int count, int min, int max) {
-//			this(block, false, size, count, min, max);
-//		}
-//		
-////		public OreSettings(IBlockState block) {
-////			this(block, 9, 20, 0, 64);
-////		}
-//		
-//		public FeatureOres createGenerator() {
-//			return new FeatureOres(this.state, this.count, this.addCount, this.size, this.minHeight, this.maxHeight, this.distrib);
-//		}
-//		
-////		public OreSettings clone() {
-////			return new OreSettings(this.state, this.distrib, this.size, this.count, this.addCount, this.minHeight, this.maxHeight);
-////		}
-//	}
-	
 	public static enum GeneratorType {
 		FLAT("flat"), PERLIN("perlin"), SIMPLE("simple"), ISLAND("island"), CAVERN("cavern"), DESTROYED("destroyed");
 		
@@ -225,7 +170,6 @@ public abstract class Dimension extends Nameable implements Comparable<Dimension
 	private long rotationPeriod = 1L;
 	private int timeQualifier = 9;
 	private int brightness = 0;
-//	private String customName = null;
 	
 	// server / gen
 	private Weather defaultWeather = Weather.CLEAR;
@@ -290,11 +234,7 @@ public abstract class Dimension extends Nameable implements Comparable<Dimension
 	public final void setFullName(String name) {
 		this.fullName = name;
 	}
-
-//	public final void setCustomName(String name) {
-//		this.customName = name;
-//	}
-
+	
 	public final void setSeed(long seed) {
 		this.seed = seed;
 	}
diff --git a/common/src/common/world/SkyboxType.java b/common/src/common/dimension/SkyboxType.java
similarity index 95%
rename from common/src/common/world/SkyboxType.java
rename to common/src/common/dimension/SkyboxType.java
index 950989f..3183956 100644
--- a/common/src/common/world/SkyboxType.java
+++ b/common/src/common/dimension/SkyboxType.java
@@ -1,4 +1,4 @@
-package common.world;
+package common.dimension;
 
 import java.util.Map;
 
diff --git a/common/src/common/init/UniverseRegistry.java b/common/src/common/init/UniverseRegistry.java
index 324828a..f68be9a 100755
--- a/common/src/common/init/UniverseRegistry.java
+++ b/common/src/common/init/UniverseRegistry.java
@@ -13,6 +13,7 @@ import common.collect.Maps;
 import common.collect.Sets;
 import common.color.DyeColor;
 import common.dimension.Area;
+import common.dimension.CloudType;
 import common.dimension.DimType;
 import common.dimension.Dimension;
 import common.dimension.Domain;
@@ -32,7 +33,6 @@ import common.nbt.NBTTagCompound;
 import common.nbt.NBTTagList;
 import common.rng.Random;
 import common.util.PortalType;
-import common.world.CloudType;
 import common.world.State;
 import common.world.Weather;