More structure in server.js