CHANGE: Refactor services

Signed-off-by: arturkandur <arturkandur@gmail.com>