More separation into interfaces and services.