Further tuning of the build scripts. The bootstrap now goes into the bootstrap directory to minimise interference with the CVS lib directory.