Cleaned up some violations that were reported by PMD.
Moved some classes to seperate packages.