some progress on restructure of animation class