bootstrap: readd missing files from legacy bootstrap. Must have been wrong file manipulation during the moves.