Split chapter 7 and reorganized