Code cleanup.
Moved cs files to Tokens