Modify bimap location to topology.
Merge pull request #858 from adrian-rosello/feature/change-bimap-location

Modify bimap location to topology.