Move the Move constructors to move.d, and simplify