Reviewing Java package arrangement. Minor changes.