Moving to a modular architecture