AWS API now 'aws' subcollection in 'wrap'.
Fixup of requires to package reorg.