simplified router
consolidated generators etc
updated router + config