Both, kinda. So your skill tree now has Range/Stealth/Melee like usual, and you get to choose the direction. Each branch will have skills that are integrated into the default control scheme without specially assigned buttons (press Triangle after a parry to throw a smoke bomb, press R3 on a downed enemy to stomp them).