Update and rename Mapa.java to Avenida.java