Adjust json file layout so order can be respected.

Entries in 'all' blocks will be inserted into all the categories eleminating
the need to search for the category match then the all match.
Minor style change.