Just moved around a lot of stuff to make things easier to read/navigate Removed potion stuff; bukkit api seems to be broken for now