Merged adapter/converter registry; refactored internals - tests passing