Moved tokens functions to separate file, updated makefile to compile additional files