Refactor Animals interface to Animal. Adds BUKKIT-5770