[cvs-nhc98] Re-organise nhc98 to make it ready to use hierarchical lib