Split demo and inst into own chapters
Simplify other components