rearranging chapters as suggested in #322. Note that existing issues will need to be updated to reflect this.