[cvs-nhc98] Move around the locations of installed hat components a li