Tried to handle cancelled animations better when the proxy is removed
Refactored package structure