Fix new structure
Fix server.js