Put move translation in separate routines