Dev tools master based

Renamed files according to the reorg., reorganized content in some chapter, updated chapter contents lists, fixed figure numbering.