Remove useless class
Refactor package