More pythonic 3 strings. Removed some old #TODOs
Fixed error on moving files.
Fixed error on moving files. More "pythonic 3" management of strings.
Little refactoring done.