Moved conversion functions to main module.
Simplified API, where possible.
First adaption on API changes/extensions.