Update makefile to cope with new directory organisation.
Update documentation to point to latest.