Rename default java packages to include 'module' instead of 'plugin'

Change-Id: Ibaa39c9d4e2333ec965faacda4cc57fa265d9a99