Hmm.
I think you still need warriors and mages and such, but we need to arrange them totally differently?
Warriors are broken out by fighting style: no general "fighter", but specific classes like swashbuckler, knight, assassin, gladiator, etc.
Rogues as in skill-focused non-combat classes...