annotations must be just before class

patches to correct position of annotations.
This should have been reviewed prior to merging. It broke any installation with the [xvpu](https://github.com/geekwright/xvpu) module by creating an unresolvable dependency.

There are ways we could deal with that, but not if it isn't put up for review first. Changing composer.json is not without possible side effects.