remove unused class
Correct package names