Copy changes back from Win7 to try & check for function on the mac.
Restructure bfutils as developed on Win7.