Update and rename Map.java to MapPlaces.java