Slight re-organisation, class rename
First pass Tokenizer