Reorganized chapters according to meeting with Rachid
Fixed many typos/style issues