RUNS: Refactor of the AnimationSystem