remove strange token arg string
rename some files. cleanup