Structure now begining to match new architecture