Changed chapter structures; moved items around chapters