Refactrored GenericMaker
Added RouteMaker (as opposed to GenericMaker)
Refactored AutoRouteMaker
Added Test for DefaultMaker
Fixed everything so that Functional test works