Merge "Make directory structure + Java packages consistent." into lmp-dev