Remove typo and unecessary info
Extract amazon envelope to its own class
Change envelope class structure
Add a few xsd for further validation