Re-unify move and position; it's just position now