[cvs-nhc98] patch applied (hat): Re-arrange the names of src directories.