merged app.js with serveices.js