remove unused classes
chane package hiearchy