tinker

rename some files
warnings, formatting, conditions, test changes, cleaning, and so on...