Upgrading the PSI Accelerator Facility for High Intensity Operation