mc: Prepare to move system to real /usr
heimdal: Prepare to move system to real /usr