Added Routing to Mappings to enable index routing
Tweaked placement of new classes
Merge branch 'routing'