Full migration to bootstrap and base code