[#XDSB-70] Refactor to split webservices in independent deployments | dependency fixes