updated server.js and cleaned up files