remove unused class
move packages