Package name refactoring and self wrong dependecy