No bug - Move route generators to server.js. r=me