Added several more scanner tests
Further modularized the project tree
Improved a few token predicates