Added Routing to Mappings to enable index routing
Tweaked placement of new classes
Merge pull request #88 from Synata/master

Enable Routing in Mappings