modified web.js and server.js to use new folder structure.