- rename some files
- Clean code
- Corrected display line