Revert "Refactored movement to use angles rather than plain xy thresholds"

This reverts commit 125fedb43f7e673ba9f5e718f5e8f5aba74b02a2.