Renamed HexGrid to World
Merge
Corrected Move()