Base refactoring, animator class