Rename exported methods to be idiomatic
Moved data manip to separate package
Refactoring, more clever way of handling unmarshalling errors