refactoring packages names to be compliant to naming to java convention