[ ...so a divide not erased, but moved, if there was magic that everyone had and "special magic." ]

I see. You'll have to excuse my fascination. It's hard for me to imagine a world where everyone is able to do magic, because in my world my country is one of the only ones that doesn't kill, enslave, or experiment on those who can manipulate matter. But it sounds like your world has its own divisions.