Renaming Server.js
Clearning up service