[cvs-nhc98] patch applied (hat): A big re-organisation of I/O. Two main changes: