Don't pack the single module into another module
Regenerate OASIS

Signed-off-by: David Scott <dave.scott@eu.citrix.com>