Renamed world.cpp/h to map.cpp/h