Merge "Move packet definitions to their own file."
am: ed1aa266ce

* commit 'ed1aa266cef795e383cc9a7ee77f860eaca8b7fe':
  Move packet definitions to their own file.