[prepare_system.sh] Rearrange some of the stuff