am 382575b5: Merge "Rename packages to match directory structure."

* commit '382575b597f209f04ecdb5efae1036bf241c8d70':
  Rename packages to match directory structure.