Move stuff; rename stuff.