I've been diving into some map code (planning to add cities to the map), and had a few questions/thoughts on the code organization. - Are LegacyMap/OldLegacyMap officially unused and/or obsolete? It looks like they aren't being used by the rest of the code anymore. If so, and if we want to keep them around for reference, I'd propose a Git tag as an option to keep them available if we're looking for them, but not in the main branch so we don't think they're in use. - Maybe a stylistic thing, but I think we should generally keep one class per file, other than embedded classes. We currently have an interface and four classes in MapView, and it's about 440 lines, which to me seems like a point at which we should be splitting it into multiple files to make it easier to keep track of them. - If we do create multiple files for the map, we should also move it into a folder, as LegacyMap/OldLegacyMap already are. I wanted to check with others before making any changes, particularly as there may be changes-in-progress on MapView. But I'll likely be adding another class to that file, and it feels overcrowded, so I wanted to make the suggestion.