Work on creatures (refactoring, import improvment)