move+adjust where the packet size is defined, fixes #17