Bob,
At least on my verison of the 2005 CD25, the water tank is on the centerline under the v-berth with the fill on the gunwale just forward of the cabin. The pump is behind the water heater under the rear seat of the dinette and the plumbing runs from there under the closet, step, and floor...