Renamed tokencreator in preparation for a rewrite
Modularised the tokenizer