Revert "New Animation Structure"

This reverts commit f83667e767cef2216a5150a9a57b107c4fc59c40.