reorganized chapter layout