Fixups and renumbering in Baselli
Renumbering & initial routing on Baselli