Sorted and relabeled services

Renaming and sorting of chapters to emphasize component names,
together with sorting of two lists.

Also, update version number of clients in example to use
current numbers.

Change-Id: Ib4e9ee08336ea98b627e52afd47377691ef98e63
Merge "Sorted and relabeled services"