Moved WorldMap to WorldBDI and did some more fixes