Refactoring, renaming mapbuilder::Map -> mapbuilder::MapList