Re-ordering things to make updating external config files easier.