Reorganised Token classes
* Improved token handling methods
* Cosmetic stuff