Improve ordering of chapters and introduce a bit of organization