Some reorganisation and updates to the readme