update TODO
determined format for token matching
reorganised files for greater sanity
updated Makefile