Update makefile
Reorder chapters
Update headers style