Moving things around in dataset domain and service modules.