Make directory structure + Java packages consistent.

Fixes Eclipse compilation errors.

Change-Id: I2898a2aaf2b19b4c64fd523f792bb224c79b5d75
3 files changed