Redirect b1/b2 calls in ms directory to new location