indent fix
Moves services to correct packages, changes the interfaces according to the  changes server side API,

Moves services to correct packages, changes the interfaces according to the  changes server side API,