Relocated bootstrap to appropriate location