- remove unnecessary files and functions
- rearrange and renamed the files and functions