Remodeling of the Heavy-Water Facility of the Kyoto University Reactor for Epithermal and Thermal Neutrons