router/route refactor & named endpoints