Change repackaged location to match other libraries' conventions for repackaging classes.
Update version of asm to be compatible with JDK 8.
Reinstate code lost in merge.