Pwh/aws

Moved parsers out to separate module.
Could be a static field in the module but this works too.