This removes the redundancy between faction variants and adjusts the layout to be more consistent with the other mods.