diff --git a/java/net/minecraft/block/state/IBlockState.java b/java/net/minecraft/block/state/IBlockState.java
index bd291a0..da591b8 100644
--- a/java/net/minecraft/block/state/IBlockState.java
+++ b/java/net/minecraft/block/state/IBlockState.java
@@ -1,10 +1,11 @@
 package net.minecraft.block.state;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.Collection;
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.IProperty;
 
+import java.util.Collection;
+
 /** This code is owned by Minecraft */
 
 public interface IBlockState
diff --git a/java/net/minecraft/util/math/BlockPos.java b/java/net/minecraft/util/math/BlockPos.java
index be39f1f..20b8857 100644
--- a/java/net/minecraft/util/math/BlockPos.java
+++ b/java/net/minecraft/util/math/BlockPos.java
@@ -1,20 +1,17 @@
 package net.minecraft.util.math;
 
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Lists;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3i;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Lists;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.MathHelper;
+import javax.annotation.concurrent.Immutable;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Pasted in from 1.9, with the Vec3d constructor removed
diff --git a/java/noppes/npcs/api/AbstractNpcAPI.java b/java/noppes/npcs/api/AbstractNpcAPI.java
index 16fdf20..a21bdc8 100644
--- a/java/noppes/npcs/api/AbstractNpcAPI.java
+++ b/java/noppes/npcs/api/AbstractNpcAPI.java
@@ -5,9 +5,6 @@
 
 package noppes.npcs.api;
 
-import java.io.File;
-import java.util.HashMap;
-
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.EventBus;
 import net.minecraft.entity.Entity;
@@ -32,6 +29,9 @@ import noppes.npcs.api.handler.data.ISound;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.api.overlay.ICustomOverlay;
 
+import java.io.File;
+import java.util.HashMap;
+
 /**
  * This object stores functions available to all scripting handlers through the "API" keyword.
  *
diff --git a/java/noppes/npcs/api/IWorld.java b/java/noppes/npcs/api/IWorld.java
index 26286ac..0f5a7e7 100644
--- a/java/noppes/npcs/api/IWorld.java
+++ b/java/noppes/npcs/api/IWorld.java
@@ -1,11 +1,11 @@
 package noppes.npcs.api;
 
 import net.minecraft.world.WorldServer;
-import noppes.npcs.api.scoreboard.IScoreboard;
 import noppes.npcs.api.entity.IEntity;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.handler.data.ISound;
 import noppes.npcs.api.item.IItemStack;
+import noppes.npcs.api.scoreboard.IScoreboard;
 
 public interface IWorld {
     /**
diff --git a/java/noppes/npcs/api/entity/IPlayer.java b/java/noppes/npcs/api/entity/IPlayer.java
index f800d8c..185e79b 100644
--- a/java/noppes/npcs/api/entity/IPlayer.java
+++ b/java/noppes/npcs/api/entity/IPlayer.java
@@ -3,12 +3,12 @@ package noppes.npcs.api.entity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import noppes.npcs.api.*;
+import noppes.npcs.api.gui.ICustomGui;
 import noppes.npcs.api.handler.IOverlayHandler;
 import noppes.npcs.api.handler.IPlayerData;
 import noppes.npcs.api.handler.data.IAnimationData;
 import noppes.npcs.api.handler.data.IDialog;
 import noppes.npcs.api.handler.data.IQuest;
-import noppes.npcs.api.gui.ICustomGui;
 import noppes.npcs.api.handler.data.ISound;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.api.overlay.ICustomOverlay;
diff --git a/java/noppes/npcs/api/event/ICustomGuiEvent.java b/java/noppes/npcs/api/event/ICustomGuiEvent.java
index 6ea7211..b3f905e 100644
--- a/java/noppes/npcs/api/event/ICustomGuiEvent.java
+++ b/java/noppes/npcs/api/event/ICustomGuiEvent.java
@@ -1,7 +1,6 @@
 package noppes.npcs.api.event;
 
 import cpw.mods.fml.common.eventhandler.Cancelable;
-import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.gui.ICustomGui;
 import noppes.npcs.api.item.IItemStack;
 
diff --git a/java/noppes/npcs/api/event/IDialogEvent.java b/java/noppes/npcs/api/event/IDialogEvent.java
index efe0d73..691a730 100644
--- a/java/noppes/npcs/api/event/IDialogEvent.java
+++ b/java/noppes/npcs/api/event/IDialogEvent.java
@@ -1,7 +1,6 @@
 package noppes.npcs.api.event;
 
 import cpw.mods.fml.common.eventhandler.Cancelable;
-import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.handler.data.IDialog;
 
 public interface IDialogEvent extends IPlayerEvent {
diff --git a/java/noppes/npcs/api/event/IFactionEvent.java b/java/noppes/npcs/api/event/IFactionEvent.java
index d021e45..6750588 100644
--- a/java/noppes/npcs/api/event/IFactionEvent.java
+++ b/java/noppes/npcs/api/event/IFactionEvent.java
@@ -1,7 +1,6 @@
 package noppes.npcs.api.event;
 
 import cpw.mods.fml.common.eventhandler.Cancelable;
-import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.handler.data.IFaction;
 
 public interface IFactionEvent extends IPlayerEvent {
diff --git a/java/noppes/npcs/api/event/IProjectileEvent.java b/java/noppes/npcs/api/event/IProjectileEvent.java
index 80d425c..657c68d 100644
--- a/java/noppes/npcs/api/event/IProjectileEvent.java
+++ b/java/noppes/npcs/api/event/IProjectileEvent.java
@@ -1,11 +1,8 @@
 package noppes.npcs.api.event;
 
-import cpw.mods.fml.common.eventhandler.Cancelable;
 import noppes.npcs.api.IBlock;
 import noppes.npcs.api.entity.IEntity;
 import noppes.npcs.api.entity.IProjectile;
-import noppes.npcs.api.handler.data.IQuest;
-import noppes.npcs.api.item.IItemStack;
 
 public interface IProjectileEvent extends ICustomNPCsEvent {
 
diff --git a/java/noppes/npcs/api/gui/ICustomGui.java b/java/noppes/npcs/api/gui/ICustomGui.java
index 44ef116..3495197 100644
--- a/java/noppes/npcs/api/gui/ICustomGui.java
+++ b/java/noppes/npcs/api/gui/ICustomGui.java
@@ -6,8 +6,8 @@
 package noppes.npcs.api.gui;
 
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.api.item.IItemStack;
 
 import java.util.List;
 
diff --git a/java/noppes/npcs/api/handler/IRecipeHandler.java b/java/noppes/npcs/api/handler/IRecipeHandler.java
index af1d000..3a4be27 100644
--- a/java/noppes/npcs/api/handler/IRecipeHandler.java
+++ b/java/noppes/npcs/api/handler/IRecipeHandler.java
@@ -5,10 +5,11 @@
 
 package noppes.npcs.api.handler;
 
-import java.util.List;
 import net.minecraft.item.ItemStack;
 import noppes.npcs.api.handler.data.IRecipe;
 
+import java.util.List;
+
 public interface IRecipeHandler {
     List<IRecipe> getGlobalList();