Structure changes, more decoupling of components