Update and rename Grid.java to Map.java

Renamed things to maintain consistency.