cleanup
Moved all services to services.js