Rename main class to DemoApp
Start development of new tokenizer