Finished animation classes and simplified overall design