The current factions do indeed not make any sense. It is long overdue to get them merged, and add a new flexible faction for villains instead - which would maintain the two-faction feeling and not throw off the story.
I have a whole thread about this: