better fix for cyclic imports
Duplicate files removed
removed pmd violations