Re-oraganizing to match Minecraft class order