Restructure bootstrap