Updated express.js and moved some files around