rearrange relmap-related modules