Move bootstrapping changes to new bootstrap file