IM: Fixed routing after Bohan's restructure