Made changes to layout, packet structure, etc. to match Kevin's changes