Fix git history

[JonathanXDR]

• [ ] Migrate to conventional commits
• [ ] Use proper commit messages, for those not having them yet
• [ ] Squash commits following directly after each other and having the same name