the new structure for this project should be per chapter