Delete unused class and set new packages