v7 - Cleanup & Improvements

In v7 we will remove some methods that we have deprecated in v6 and restructure the sources a bit. It will be the first release with small breaking changes since we maintain it.