Delete move actions
Revert "Delete move actions"

This reverts commit 08248f0a026f0721829afa5da44c3d3d51e05741.
Refactor move functions.