Redesign how chapters are included in main.tex, including Ch 1 folder name adjustment