Merge REST API services into main service module

Right now there are two service layers and it is unclear which one to use. Merging them would make the code easier to maintain IMHO.