[#XDSB-70] Refactor to split webservices | more dependency versions fixed