Updated data structures and variable / types

Revised these to match the output from the system to be used for the
practicals. Also added some stuff in on variable names.