Switched to a modular structure