#1 refactoring of animations, renamed animation to fx