move domain into core