Update and rename Map.java to World.java