Update and rename Map.H to R-3.H