Move service providers out of dedicated directory.