Major refactoring of Map-Tile-Cell hierarchy