Readme improvements
library reorganisation
test changes to deal with library reorg