Reshuffle services.js