Restructure part I