Move old files into legacy for now
Some work on tokenizer