Add rfi folder and update bootstrap