Mainly code reorganisation.