Separate general and token specific code

Change-Id: I36f19eb2583398c2badcf7b078684412ed99922b
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
8 files changed