Link above contains a complete file for chapter 6. I'll see about getting the other chapters sorted the same way later.