Finish coffee migration, refactor router