Refactrored GenericMaker
Added RouteMaker (as opposed to GenericMaker)
Refactored AutoRouteMaker