Reorganize targets

The targets are divided in groups separated by descriptive comments and sorted alphabetically by host.