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

Fixed findbugs issues.