Modularising the main responsibilities.