Pwh/aws

Moved parsers out to separate module.