Complete bootstrap refactoring