Cleaned up files and server.js