Moved movement closures to a separate file