Many small changes to go with the reorganisation