class name  & packaging refactoring