Fixes #31 - Remove references to Sprinter

Remove data classes from mapping to use Model classes.

Fix some test along the way