cleanup a bit
rename some files