added map, router, removed underscore templates