Created by: guillaume-plc
A bit of clean up to make path and file handling more cross-platform friendly.