am c72b69fb: Merge "Move dictionary code to top level dictionary dir."

* commit 'c72b69fb2b48824335de61d4ac17bb9e85232852':
  Move dictionary code to top level dictionary dir.