Beginning of Bootstrap only restructuring