move stuff out of bs3/