refactor animator + tool hierarchies