Add DataMapper support

Cleanup module naming, remove bad deps

A better version of #73