New Year New Release

This has some small fixes but mostly a restructuring of files. Enjoy ✨ Also @reporobot has had some updates, too 🤖