Minor multimap cleanup (alligning package layout with other modules)
Merge pull request #3766 from pveentjer/cleanup/3.x/multimap

Minor multimap cleanup (alligning package layout with other modules)