There's no way they could remove base classes without horribly gutting the storylines in the process. There is still a very clear distinction between Rogue and Ninja.