Code cleanup based on FindBugs and CodePro.
Restructure on the packages again.