(Flat street) reorganize and simplify chapter

Fix #80