kill sets
kill collections
reorganization
merge tokens into one file; move xml stuff into separate folder