Fixed findbugs issues.
Moved impl classes to impl packages
Added package-info
Merge pull request #3457 from mdogan/fix/3.4/findbugs

Fixed findbugs issues.