Updated SDK and minor code reorganisation.