Major reorganising to improve coupling between modules