fix package and visibility