Move bootstrapping to bootstrap.pp