organise prebuilts and lil updates to b2r2 headers