Minor multimap cleanup (alligning package layout with other modules)