am 7eed33ef: Merge "Make directory structure + Java packages consistent." into lmp-dev

* commit '7eed33efe211ba8129fdecbfe0d8053a5473d906':
  Make directory structure + Java packages consistent.