Revert "Animation class structure 035.2"

This reverts commit 9185dac2423b87d875573c708e63cd37750268b7.