Lots of changes

- naming
- added and removed packages
- can’t type more ;)