Sensible.
Repair package statements after moves.