fix package name and add class