Restructure and bootstrap update