[cvs-nhc98] Get directory structure correct.