Fixed to convert to www/ only if including zipassetmanifest.  Cleaned up some more