diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
index 1440724a5..7b016e5e6 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
@@ -46,11 +46,11 @@ import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Liquids;
 import biomesoplenty.worldgen.WorldGenAlgae;
 import biomesoplenty.worldgen.WorldGenAsh;
+import biomesoplenty.worldgen.WorldGenBOPFlowers;
 import biomesoplenty.worldgen.WorldGenBadlands;
 import biomesoplenty.worldgen.WorldGenBadlands2;
 import biomesoplenty.worldgen.WorldGenBadlands3;
 import biomesoplenty.worldgen.WorldGenBadlands4;
-import biomesoplenty.worldgen.WorldGenBOPFlowers;
 import biomesoplenty.worldgen.WorldGenBoneSpine;
 import biomesoplenty.worldgen.WorldGenBoneSpine2;
 import biomesoplenty.worldgen.WorldGenBoulder;
diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java b/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
index e17f4292e..636e1e3b5 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java
@@ -11,11 +11,11 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenOminous1;
 import biomesoplenty.worldgen.WorldGenOminous3;
 import biomesoplenty.worldgen.WorldGenOminous4;
-import biomesoplenty.api.Blocks;
 
 public class BiomeGenOminousWoodsThick extends BiomeGenBase
 {
diff --git a/src/minecraft/biomesoplenty/blocks/BlockGrave.java b/src/minecraft/biomesoplenty/blocks/BlockGrave.java
index 81ec681c3..b9dd76c72 100644
--- a/src/minecraft/biomesoplenty/blocks/BlockGrave.java
+++ b/src/minecraft/biomesoplenty/blocks/BlockGrave.java
@@ -1,7 +1,5 @@
 package biomesoplenty.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.particle.EffectRenderer;
@@ -17,6 +15,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import biomesoplenty.BiomesOPlenty;
 import biomesoplenty.tileentities.TileEntityGrave;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockGrave extends Block
 {
diff --git a/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java
index a182ea362..deb1e83f2 100644
--- a/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java
+++ b/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java
@@ -1,8 +1,8 @@
 package biomesoplenty.blocks.renderers;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
diff --git a/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java
index 4bc2e484f..6558e248f 100644
--- a/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java
+++ b/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java
@@ -1,9 +1,9 @@
 package biomesoplenty.blocks.renderers;
  
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java
index bb13c922f..9c720a077 100644
--- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java
+++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java
@@ -10,107 +10,7 @@ import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeDictionary.Type;
 import net.minecraftforge.common.BiomeManager;
 import biomesoplenty.api.Biomes;
-import biomesoplenty.biomes.BiomeGenAlps;
-import biomesoplenty.biomes.BiomeGenArctic;
-import biomesoplenty.biomes.BiomeGenBadlands;
-import biomesoplenty.biomes.BiomeGenBambooForest;
-import biomesoplenty.biomes.BiomeGenBayou;
-import biomesoplenty.biomes.BiomeGenBeachGravel;
-import biomesoplenty.biomes.BiomeGenBeachOvergrown;
-import biomesoplenty.biomes.BiomeGenBirchForest;
-import biomesoplenty.biomes.BiomeGenBog;
-import biomesoplenty.biomes.BiomeGenBorealForest;
-import biomesoplenty.biomes.BiomeGenBrushland;
-import biomesoplenty.biomes.BiomeGenCanyon;
-import biomesoplenty.biomes.BiomeGenCanyonRavine;
-import biomesoplenty.biomes.BiomeGenChaparral;
-import biomesoplenty.biomes.BiomeGenCherryBlossomGrove;
-import biomesoplenty.biomes.BiomeGenConiferousForest;
-import biomesoplenty.biomes.BiomeGenConiferousForestSnow;
-import biomesoplenty.biomes.BiomeGenCrag;
-import biomesoplenty.biomes.BiomeGenDeadForest;
-import biomesoplenty.biomes.BiomeGenDeadForestSnow;
-import biomesoplenty.biomes.BiomeGenDeadSwamp;
-import biomesoplenty.biomes.BiomeGenDeadlands;
-import biomesoplenty.biomes.BiomeGenDeciduousForest;
-import biomesoplenty.biomes.BiomeGenDesertNew;
-import biomesoplenty.biomes.BiomeGenDunes;
-import biomesoplenty.biomes.BiomeGenFen;
-import biomesoplenty.biomes.BiomeGenField;
-import biomesoplenty.biomes.BiomeGenForestNew;
-import biomesoplenty.biomes.BiomeGenFrostForest;
-import biomesoplenty.biomes.BiomeGenFungiForest;
-import biomesoplenty.biomes.BiomeGenGarden;
-import biomesoplenty.biomes.BiomeGenGlacier;
-import biomesoplenty.biomes.BiomeGenGrassland;
-import biomesoplenty.biomes.BiomeGenGrove;
-import biomesoplenty.biomes.BiomeGenHeathland;
-import biomesoplenty.biomes.BiomeGenHighland;
-import biomesoplenty.biomes.BiomeGenHillsNew;
-import biomesoplenty.biomes.BiomeGenHotSprings;
-import biomesoplenty.biomes.BiomeGenIcyHills;
-import biomesoplenty.biomes.BiomeGenJadeCliffs;
-import biomesoplenty.biomes.BiomeGenJungleNew;
-import biomesoplenty.biomes.BiomeGenLushDesert;
-import biomesoplenty.biomes.BiomeGenLushSwamp;
-import biomesoplenty.biomes.BiomeGenMangrove;
-import biomesoplenty.biomes.BiomeGenMapleWoods;
-import biomesoplenty.biomes.BiomeGenMarsh;
-import biomesoplenty.biomes.BiomeGenMeadow;
-import biomesoplenty.biomes.BiomeGenMeadowForest;
-import biomesoplenty.biomes.BiomeGenMesa;
-import biomesoplenty.biomes.BiomeGenMoor;
-import biomesoplenty.biomes.BiomeGenMountain;
-import biomesoplenty.biomes.BiomeGenMysticGrove;
-import biomesoplenty.biomes.BiomeGenNetherBase;
-import biomesoplenty.biomes.BiomeGenNetherBone;
-import biomesoplenty.biomes.BiomeGenNetherDesert;
-import biomesoplenty.biomes.BiomeGenNetherGarden;
-import biomesoplenty.biomes.BiomeGenNetherLava;
-import biomesoplenty.biomes.BiomeGenOasis;
-import biomesoplenty.biomes.BiomeGenOceanCoral;
-import biomesoplenty.biomes.BiomeGenOceanKelp;
-import biomesoplenty.biomes.BiomeGenOminousWoods;
-import biomesoplenty.biomes.BiomeGenOminousWoodsThick;
-import biomesoplenty.biomes.BiomeGenOrchard;
-import biomesoplenty.biomes.BiomeGenOriginValley;
-import biomesoplenty.biomes.BiomeGenOutback;
-import biomesoplenty.biomes.BiomeGenPasture;
-import biomesoplenty.biomes.BiomeGenPastureMeadow;
-import biomesoplenty.biomes.BiomeGenPastureThin;
-import biomesoplenty.biomes.BiomeGenPlainsNew;
-import biomesoplenty.biomes.BiomeGenPolar;
-import biomesoplenty.biomes.BiomeGenPrairie;
-import biomesoplenty.biomes.BiomeGenPromisedLandForest;
-import biomesoplenty.biomes.BiomeGenPromisedLandPlains;
-import biomesoplenty.biomes.BiomeGenPromisedLandSwamp;
-import biomesoplenty.biomes.BiomeGenQuagmire;
-import biomesoplenty.biomes.BiomeGenRainforest;
-import biomesoplenty.biomes.BiomeGenRedwoodForest;
-import biomesoplenty.biomes.BiomeGenSacredSprings;
-import biomesoplenty.biomes.BiomeGenSavanna;
-import biomesoplenty.biomes.BiomeGenScrubland;
-import biomesoplenty.biomes.BiomeGenSeasonalForest;
-import biomesoplenty.biomes.BiomeGenShield;
-import biomesoplenty.biomes.BiomeGenShore;
-import biomesoplenty.biomes.BiomeGenShrubland;
-import biomesoplenty.biomes.BiomeGenShrublandForest;
-import biomesoplenty.biomes.BiomeGenSludgepit;
-import biomesoplenty.biomes.BiomeGenSpruceWoods;
-import biomesoplenty.biomes.BiomeGenSteppe;
-import biomesoplenty.biomes.BiomeGenSwampNew;
-import biomesoplenty.biomes.BiomeGenTaigaNew;
-import biomesoplenty.biomes.BiomeGenTemperateRainforest;
-import biomesoplenty.biomes.BiomeGenThicket;
-import biomesoplenty.biomes.BiomeGenTimber;
-import biomesoplenty.biomes.BiomeGenTimberThin;
-import biomesoplenty.biomes.BiomeGenTropicalRainforest;
-import biomesoplenty.biomes.BiomeGenTropics;
-import biomesoplenty.biomes.BiomeGenTundra;
-import biomesoplenty.biomes.BiomeGenVolcano;
-import biomesoplenty.biomes.BiomeGenWasteland;
-import biomesoplenty.biomes.BiomeGenWetland;
-import biomesoplenty.biomes.BiomeGenWoodland;
+import biomesoplenty.biomes.*;
 import biomesoplenty.world.WorldTypeBOP;
 
 import com.google.common.base.Optional;
diff --git a/src/minecraft/biomesoplenty/entities/render/RenderDart.java b/src/minecraft/biomesoplenty/entities/render/RenderDart.java
index 7d38fa5b6..6b6aa59fb 100644
--- a/src/minecraft/biomesoplenty/entities/render/RenderDart.java
+++ b/src/minecraft/biomesoplenty/entities/render/RenderDart.java
@@ -2,9 +2,9 @@ package biomesoplenty.entities.render;
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
diff --git a/src/minecraft/biomesoplenty/entities/render/RenderGlob.java b/src/minecraft/biomesoplenty/entities/render/RenderGlob.java
index a63fb0afa..ce3b99827 100644
--- a/src/minecraft/biomesoplenty/entities/render/RenderGlob.java
+++ b/src/minecraft/biomesoplenty/entities/render/RenderGlob.java
@@ -2,9 +2,9 @@ package biomesoplenty.entities.render;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
diff --git a/src/minecraft/biomesoplenty/entities/render/RenderJungleSpider.java b/src/minecraft/biomesoplenty/entities/render/RenderJungleSpider.java
index 4c164301e..82b8a56e1 100644
--- a/src/minecraft/biomesoplenty/entities/render/RenderJungleSpider.java
+++ b/src/minecraft/biomesoplenty/entities/render/RenderJungleSpider.java
@@ -1,9 +1,9 @@
 package biomesoplenty.entities.render;
 
 import net.minecraft.client.renderer.entity.RenderSpider;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
diff --git a/src/minecraft/biomesoplenty/entities/render/RenderRosester.java b/src/minecraft/biomesoplenty/entities/render/RenderRosester.java
index 9a738e09c..76d24a0f1 100644
--- a/src/minecraft/biomesoplenty/entities/render/RenderRosester.java
+++ b/src/minecraft/biomesoplenty/entities/render/RenderRosester.java
@@ -2,11 +2,11 @@ package biomesoplenty.entities.render;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
 import biomesoplenty.entities.EntityRosester;
 
 public class RenderRosester extends RenderLiving
diff --git a/src/minecraft/biomesoplenty/helpers/Localizations.java b/src/minecraft/biomesoplenty/helpers/Localizations.java
index a8628a136..9f996ef3a 100644
--- a/src/minecraft/biomesoplenty/helpers/Localizations.java
+++ b/src/minecraft/biomesoplenty/helpers/Localizations.java
@@ -2,7 +2,7 @@ package biomesoplenty.helpers;
 
 import java.util.logging.Level;
 
-import net.minecraft.client.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
diff --git a/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java b/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java
index 0dd639678..1cefe23c2 100644
--- a/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java
+++ b/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java
@@ -2,7 +2,7 @@ package biomesoplenty.particles;
 
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
diff --git a/src/minecraft/biomesoplenty/particles/EntitySteamFX.java b/src/minecraft/biomesoplenty/particles/EntitySteamFX.java
index 821c541a0..9ce6b2f03 100644
--- a/src/minecraft/biomesoplenty/particles/EntitySteamFX.java
+++ b/src/minecraft/biomesoplenty/particles/EntitySteamFX.java
@@ -2,7 +2,7 @@ package biomesoplenty.particles;
 
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
diff --git a/src/minecraft/biomesoplenty/potions/PotionParalysis.java b/src/minecraft/biomesoplenty/potions/PotionParalysis.java
index debcca2eb..099921f9e 100644
--- a/src/minecraft/biomesoplenty/potions/PotionParalysis.java
+++ b/src/minecraft/biomesoplenty/potions/PotionParalysis.java
@@ -1,8 +1,8 @@
 package biomesoplenty.potions;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.potion.Potion;
+import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java
index 4ce5cc9e9..5658b3e86 100644
--- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java
+++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java
@@ -1,9 +1,9 @@
 package biomesoplenty.world.layer;
 
-import biomesoplenty.api.Biomes;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.layer.GenLayer;
 import net.minecraft.world.gen.layer.IntCache;
+import biomesoplenty.api.Biomes;
 
 public class BiomeLayerSub extends BiomeLayer
 {