bigass pmd fix. i got tired of single commits for each one of them.
organized imports in whole project