Yes I replaced my water pump about 2 years ago. Definitely trace the outline of the pump and hole locations on a piece of cardboard and place the bolts in those holes in the cardboard. You do not want to mess up where they go as there are a number of different lengths.

Also draw out the pathway for the serpentine belt around the pulleys and tensioners before taking it off.