[refactoring] provide better package and class name