Progress on porting bridge into the new structure