Fix metadata so there's only 1 org