Re-arrange, to use a master file that pulls in chapter-level files