EUCA-6642 Fix Groovy stub generation

Moved inner classes and annotations out for:
* Empyrean
* ComponentId

Groovy has trouble with inner classes and annotations in some
cases (GROOVY-6085). This fix allows us to update to the latest
Groovy library.

Fixes EUCA-6642