Change floorpan to allow for better fibre routing on Serenity

See: https://docs.google.com/spreadsheets/d/1kQLFv4VQhIbojQs_f9bMysx9Rl2ImlRQ64G1-pOkMEo/edit?usp=sharing