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

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