Moved tokenizer into its own file.
Removed unnecessary includes.