fix :  Avoid cycle between java packages
refactoring package