Movement animation, base class refactoring