REDONE APP LAYOUT - Server

Server needs to in one app.js file