Fix #34 - Move Scopes to Mapper

 * This is a BREAKING change.
 * This will be released in v2.1 to minimize breakage