Changed parts of the model and view to utilize the new Animation and Movement classes.