Separate MapCells into map.cells package and refactor KeyDefinitions