[cvs-nhc98] patch applied (hat): rename the directories under src/ less redundantly