animation refactor and renaming. Fixes #24