Reorganize a bit. Waste 2 hours dealing with utf-8 problems with latex...
Commits to continue the merged book.