Rename package

- Rename package
- Delete unnecessary code