Merged classes into single file

Also shortened names of some packet attributes.