No functional changes on this patch. Better organize the delivery
system information and data types, putting everything together,
to improve readability.
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>