[#48203325]  Move connection layer services to top level of services directories