Updated to express 3.0 and reorganized the server.js a bit.