update tokenize
separate old files