Implemented basic preprocessing token functionality
* Fixed issue: directives failing to override source control
* Reorganised Token info classes
* Updated TODO