Modified file structure and chap10