I guess this is why everything is under Federation/default now, the old mess was annoying to work with.