better package and class names