fix up imports now that the branch has moved