CHANGE: Refactor services and pom.xml

Signed-off-by: arturkandurengagepoint <artur.kandur@engagepoint.com>