Organised functionality to be more modular