Reorganize chapter into 9 chapters - this should be fix now