Refactored classes to use AnimaFX