Renamed Map file and reconciled Main class.