re-org - combined software craftsmanship chapters